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

From: Jeff King <peff@peff.net>
Date: Sep 7, 2016, 22:38 UTC
Message-ID: <20160907223816.jio6gk72uuknq4ha@sigill.intra.peff.net>
In-Reply-To: <CA+P7+xr_GqU+v6RevEuqgNK5Kui=izRwD2oPvBh-4NzAp10uOQ@mail.gmail.com>

On Wed, Sep 07, 2016 at 03:28:10PM -0700, Jacob Keller wrote:

Show 11 quoted lines

> On Wed, Sep 7, 2016 at 3:04 PM, Jeff King <peff@peff.net> 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