Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

2016-12-08 Thread Junio C Hamano
Johannes Schindelin writes: > Sorry for the breakage. Apologies from me, too. Once a topic is merged, the credit still remains with the contributor, but the blame is shared by the project as a whole, with those who missed breakages during their reviews, and those who didn't review or test and l

Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

2016-12-08 Thread Robbie Iannucci
Thanks all for taking a look at this, I didn't expect such a quick response :). No hard feelings re: breakage; I know how gnarly these sorts of refactors can be (and more libification is always better :)). Robbie On Thu, Dec 8, 2016 at 3:53 AM, Johannes Schindelin wrote: > Hi Junio, > > On Wed,

Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

2016-12-08 Thread Johannes Schindelin
Hi Junio, On Wed, 7 Dec 2016, Junio C Hamano wrote: > The "libify sequencer" topic stopped passing the die_on_error option > to hold_locked_index(), and this lost an error message from "git > merge --ff-only $commit" when there are competing updates in > progress. Sorry for the breakage. When l

[PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

2016-12-07 Thread Junio C Hamano
The "libify sequencer" topic stopped passing the die_on_error option to hold_locked_index(), and this lost an error message from "git merge --ff-only $commit" when there are competing updates in progress. The command still exits with a non-zero status, but that is not of much help for an interacti