Hi Thomas,
On Sun, May 20, 2018 at 10:45 AM, Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote:
> On 05/16, Stefan Beller wrote:
>> By switching to repo_read_index_or_die, we'll get a slightly different
>> error message ("index file corrupt") as well as localization of it.
>
> Apart from the slightly different error message, and the localization
> (both of which I think are a good thing), I notice that this also
> turns a "return error(...)" into a "die(...)". I thought we were
> going more towards not 'die'ing in libgit.a code, and letting the
> caller handling the errors? Either way I think this change should be
> described in the commit message.
oops, I will to drop or fix this patch from the series as I think the
not die()ing is a good idea for libgit.
> Also all other messages in 'rerere.c' are currently not translated.
> I'm currently working on a series that includes a patch to do just
> that (amongst some other changes to 'rerere'), which I'm hoping to
> send soon-ish, but the textual conflicts should we still want this
> patch should be easy to solve.
I did not mark this series well enough, it was a mere attempt to
"see how it goes", but was retracted as a whole[1] after Junio
dreaded some merge conflicts.
[1] https://public-inbox.org/git/CAGZ79kbvjoTq5079Ks+h2HNb+D99RELYPcJk2=pvZf9-Y8dToQ@xxxxxxxxxxxxxx/
So do not feel bad about any merge conflicts in rerere, as this
series will not land any time soon.
Stefan
