Re: [PATCH 3/3] patch-ids: use commit sha1 as patch-id for merge commits

2016-09-07 Thread Jeff King
On Wed, Sep 07, 2016 at 03:28:10PM -0700, Jacob Keller wrote: > On Wed, Sep 7, 2016 at 3:04 PM, Jeff King wrote: > > The patch-ids 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

Re: [PATCH 3/3] patch-ids: use commit sha1 as patch-id for merge commits

2016-09-07 Thread Jacob Keller
On Wed, Sep 7, 2016 at 3:04 PM, Jeff King wrote: > The patch-ids 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. > The subject here is

[PATCH 3/3] patch-ids: use commit sha1 as patch-id for merge commits

2016-09-07 Thread Jeff King
The patch-ids 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