Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Hi Junio,

On Mon, 1 Aug 2016, Junio C Hamano wrote:

Johannes Schindelin [off-list ref] writes:

quoted

Subject: Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

s/merge_/merge-/; for this one alone.

I see that de8946de1694a8cf311daab7b2c416d76cb04d23 still shows it with an
underscore instead of a dash, while you fixed my other tyops in this patch
series.

I tend to think that the underscore is correct: this change is not so much
about the builtin (which is written with a dash) but about the function
(written with an underscore, used by more than just merge-recursive, e.g.
cherry-pick).

quoted

There are a couple of places where return values never indicated errors
before, as wie simply died instead of returning.

s/wie/we/;

Right. What can I say, I am surrounded by too many Germans.

I fixed this locally, in case another re-roll should be required. What you
have in `pu` looks correct to me, though. Let me know if you want me to
re-submit nevertheless.

BTW I should have said this earlier: I run all my rebases, all my merges,
all my cherry-picks using a Git version with these patches for months (of
course, the patches have changed, but not in the most critical parts I was
concerned about, the parts where die() calls were replaced). If I would
have found any regression, I would have notified you immediately, of
course.

Ciao,
Dscho