Re: [PATCH v3 2/2] patch-ids: define patch-id of merge commits as "null"

Jeff King writes: > This patch defines the patch-id of a merge commit as > essentially "null"; it has no patch-id. As a result, > merges cannot match patch-ids via "--cherry-pick", and > "format-patch --base" will not list merges in its list of > prerequisite patch ids. At first

Re: [PATCH v3 2/2] patch-ids: define patch-id of merge commits as "null"

On Fri, Sep 09, 2016 at 04:34:47PM -0400, Jeff King wrote: > This patch defines the patch-id of a merge commit as > essentially "null"; it has no patch-id. As a result, > merges cannot match patch-ids via "--cherry-pick", and > "format-patch --base" will not list merges in its list of >

[PATCH v3 2/2] patch-ids: define patch-id of merge commits as "null"

The patch-id code which powers "log --cherry-pick" doesn't look at whether each commit is a merge or not. It just feeds the commit's first parent to the diff, and ignores any additional parents. In theory, this might be useful if you wanted to find equivalence between, say, a merge commit and a