Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-12 22:28, Junio C Hamano wrote: > Johannes Schindelin writes: > >>> I think the most sensible regression fix as the first step at this >>> point is to call it as a separate process, just like the code calls >>> "apply" as a separate process for

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-09 20:40, Junio C Hamano wrote: > Junio C Hamano writes: > >>> Instead, stepping back a bit, I wonder if we can extend coverage of >>> the helpful message to all die() calls when running git-am. We could >>> just install a die routine with

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-09 20:55, Junio C Hamano wrote: > Junio C Hamano writes: > > I would prefer the endgame to be an efficient implementation of > merge_recursive_generic(), a function that you can call without you > having to worry about it dying. > > But the patch in this

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Torsten, On 2015-10-10 18:05, Torsten Bögershausen wrote: > On 09.10.15 12:11, Johannes Schindelin wrote: >> Me again, >> >> On 2015-10-09 11:50, Johannes Schindelin wrote: >>> >>> On 2015-10-09 03:40, Paul Tan wrote: On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Johannes Schindelin writes: >> I think the most sensible regression fix as the first step at this >> point is to call it as a separate process, just like the code calls >> "apply" as a separate process for each patch. Optimization can come >> later when it is shown

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

On 09.10.15 12:11, Johannes Schindelin wrote: > Me again, > > On 2015-10-09 11:50, Johannes Schindelin wrote: >> >> On 2015-10-09 03:40, Paul Tan wrote: >>> On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: Johannes Schindelin writes:

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio & Paul, On 2015-10-09 03:40, Paul Tan wrote: > On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> >>> Brendan Forster noticed that we no longer see the helpful message after >>> a failed `git pull

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Me again, On 2015-10-09 11:50, Johannes Schindelin wrote: > > On 2015-10-09 03:40, Paul Tan wrote: >> On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: >>> Johannes Schindelin writes: >>> Brendan Forster noticed that we no longer see the

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Junio C Hamano writes: > I think the most sensible regression fix as the first step at this > point is to call it as a separate process, just like the code calls > "apply" as a separate process for each patch. Optimization can come > later when it is shown that it

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Johannes Schindelin writes: > I finally have that test case working, took way longer than I wanted to: This certainly fails without any fix and passes either with your two-patch or a more conservative run_command() fix that I sent separately. However, this new test

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

On 2015-10-09 12.11, Johannes Schindelin wrote: > Me again, > > On 2015-10-09 11:50, Johannes Schindelin wrote: >> >> On 2015-10-09 03:40, Paul Tan wrote: >>> On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: Johannes Schindelin writes:

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Paul Tan writes: > That said, I do agree that even if we die(), we could try to be more > helpful by printing additional helpful instructions. > >> If that is the case, I'd thinkg that we'd prefer, as a regression >> fix to correct "that", i.e., let recursive-merge die and

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Junio C Hamano writes: >> Instead, stepping back a bit, I wonder if we can extend coverage of >> the helpful message to all die() calls when running git-am. We could >> just install a die routine with set_die_routine() in builtin/am.c. >> Then, should die() be called anywhere,

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Junio C Hamano writes: > I looked at the codepath involved, and I do not think that is a > feasible way forward in this case. It is not about a "helpful > message" at all. You would have to do everything that is done in > the error codepath in your custom die routine, which

[PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Brendan Forster noticed that we no longer see the helpful message after a failed `git pull --rebase`. It turns out that the builtin `am` calls the recursive merge function directly, not via a separate process. But that function was not really safe to be called that way, as it die()s pretty

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Brendan Forster noticed that we no longer see the helpful message after >> a failed `git pull --rebase`. It turns out that the builtin `am` calls >> the

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Johannes Schindelin writes: > Brendan Forster noticed that we no longer see the helpful message after > a failed `git pull --rebase`. It turns out that the builtin `am` calls > the recursive merge function directly, not via a separate process. > > But that function