On Wed, Sep 07, 2016 at 03:28:10PM -0700, Jacob Keller wrote: > On Wed, Sep 7, 2016 at 3:04 PM, Jeff King <peff@xxxxxxxx> 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 misleading since it says you will use sha1 of the > merge commit ,but instead just ignore merge commits and indicate they > have no patch id. I suspect this is because you switched > implementations part way through developing this. Oops, yes, that's exactly what happened. I'll wait for discussion to settle on the approach and fix it up in the re-roll. -Peff