From: Jay Soffian <jaysoffian@gmail.com>
Date: Mon, 23 May 2011 15:17:14 GMT
Subject: Re: combined diff does not detect binary files and ignores -diff attribute
Message-ID: <BANLkTinu3AbTmtswn6DLQKAWdLL=gBvAqA@mail.gmail.com>
In-Reply-To: <4DDA618E.4030604@drmicha.warpmail.net>

On Mon, May 23, 2011 at 9:30 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Jay Soffian venit, vidit, dixit 22.05.2011 22:12:
>> In a merge commit, I added some PNGs (so they were new to both
>> parents). I was surprised when I did a "git show" on the commit and
>> had the binary bits spewed to the terminal.
>>
>> I thought it was just git not detecting the PNG as a binary file, but
>> adding "*.png -diff" to .git/info/attributes made no difference.
>>
>> Just reporting this for now, as I don't have time to investigate.
>>
>> j.
>
> We know, but we somehow got stuck, see:
>
> http://permalink.gmane.org/gmane.comp.version-control.git/171613
>
> I don't have the time to follow up on this currently, it got out of
> proportion.

Drat, seems like the perfect being the enemy of the good there. I
wonder if Junio's patch in that thread isn't good enough for now.

Thanks,

j.