Re: [PATCH v3 0/2] patch-id for merges

2016-09-25 Thread Johannes Schindelin
Hi Peff, On Fri, 9 Sep 2016, Jeff King wrote: > Frankly, I still like v2 better, but I do not feel like arguing with > Johannes about it anymore. Sorry that I was a pest. I do care deeply about making our code cleaner, though, which in my mind means less of this "let exit() clean everything up a

Re: [PATCH v3 0/2] patch-id for merges

2016-09-12 Thread Junio C Hamano
Jeff King writes: > On Mon, Sep 12, 2016 at 10:18:33AM -0700, Junio C Hamano wrote: > >> > +static int patch_id_defined(struct commit *commit) >> > +{ >> > + /* must be 0 or 1 parents */ >> > + return !commit->parents || !commit->parents->next; >> > +} >> >> If we make the first hunk begin lik

Re: [PATCH v3 0/2] patch-id for merges

2016-09-12 Thread Jeff King
On Mon, Sep 12, 2016 at 10:18:33AM -0700, Junio C Hamano wrote: > > +static int patch_id_defined(struct commit *commit) > > +{ > > + /* must be 0 or 1 parents */ > > + return !commit->parents || !commit->parents->next; > > +} > > If we make the first hunk begin like so: > > > + if (commit-

Re: [PATCH v3 0/2] patch-id for merges

2016-09-12 Thread Junio C Hamano
Jeff King writes: > That looks like the patch below (as a replacement for patch 2), which is > even less invasive. It also performs a little better on my example case, > because we avoid adding merges to the hashmap entirely. After reading it, I did not find [v3 2/2] is too bad either, but this

Re: [PATCH v3 0/2] patch-id for merges

2016-09-12 Thread Jeff King
On Fri, Sep 09, 2016 at 02:01:14PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > And here is v3. Besides commit-message fixups, it drops patch 2, and > > instead the third patch teaches commit_patch_id() to distinguish between > > errors and "no patch id". > > > > Frankly, I still like

Re: [PATCH v3 0/2] patch-id for merges

2016-09-09 Thread Junio C Hamano
Jeff King writes: > And here is v3. Besides commit-message fixups, it drops patch 2, and > instead the third patch teaches commit_patch_id() to distinguish between > errors and "no patch id". > > Frankly, I still like v2 better, but I do not feel like arguing with > Johannes about it anymore. FW

[PATCH v3 0/2] patch-id for merges

2016-09-09 Thread Jeff King
On Wed, Sep 07, 2016 at 06:01:01PM -0400, Jeff King wrote: > Here's a re-roll of the series I posted at: > > > http://public-inbox.org/git/20160907075346.z6wtmqnfc6bsu...@sigill.intra.peff.net/ > > Basically, it drops the time for "format-patch --cherry-pick" on a > particular case from 3 min