Re: textconv not invoked when viewing merge commit

Jeff King [off-list ref] writes:

On Thu, Apr 14, 2011 at 01:06:19PM -0700, Junio C Hamano wrote:

quoted

Instead, I think we should just use "Binary blob $SHA-1\n" as if that is
the textconv of a binary file without textconv filter.  That would
certainly make the code much simpler, and more importantly, the output
would become more pleasant. We would show something like:

    - Binary blob bc3c57058faba66f6a7a947e1e9642f47053b5bb
     -Binary blob 536e55524db72bd2acf175208aef4f3dfc148d42
    ++Binary blob 67cfeb2016b24df1cb406c18145efd399f6a1792

if we did so.

Yeah, I think that is pretty readable. But it gives me a funny feeling
to encode magic strings inside actual diff output. That is, the output
is indistinguishable from a file which contained the "Binary blob..."
strings.

I can't think of a case where it matters, though, so maybe it is just
paranoia.

A line-counting, statistics tool would think that 1 line has been
removed from both branches, and one new added by the merge.

Well, I know no tool parsing combined diff actually, so it's indeed a
hypothetical case.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/