Re: What's cooking in git.git (Jul 2016, #05; Wed, 13)

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi Junio,

On Wed, 13 Jul 2016, Junio C Hamano wrote:

> * jc/renormalize-merge-kill-safer-crlf (2016-07-12) 2 commits
>  - merge: avoid "safer crlf" during recording of merge results

I like the verbose commit message, it really makes it easier to understand
the issue as well as the solution. As to the diff:

+       ret = add_cache_entry(ce, options);
+       if (refresh) {

Should we really refresh, even if ret < 0?

+               struct cache_entry *nce;
+
+               nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);

This line is overly long, but there is a *lot* of precedent for that in
merge-recursive.c, unfortunately. So this is just a remark, not an
objection.

>  - convert: unify the "auto" handling of CRLF

I *think* this is a good thing to do. And I also have to admit that the
only thing I can say about that test matrix in t0027 (both pre- and
post-image) is that it is visually mesmerizing. So I cannot even say
whether those changes make sense to me because I cannot wrap my head
around the changes in the tests.

Ciao,
Dscho