From: Christian Couder <christian.couder@gmail.com>
Date: Fri, 11 Jun 2010 07:24:37 GMT
Subject: Re: [PATCH] diff: bugfix: binary file permission regression
Message-ID: <AANLkTikWNaEY5aErPF7OkBMleN_hiFRholfdFXLF1cJO@mail.gmail.com>
In-Reply-To: <AANLkTimwmkMnaqMY44SeHz1L8hE2Lp324PXPY4eqvTGb@mail.gmail.com>

On Fri, Jun 11, 2010 at 9:06 AM, Nazri Ramliy <ayiehere@gmail.com> wrote:
> On Fri, Jun 11, 2010 at 2:31 AM, Nazri Ramliy <ayiehere@gmail.com> wrote:
>>              (!textconv_two && diff_filespec_is_binary(two)) )) {
>>                if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
>>                        die("unable to read files to diff");
>> +               fprintf(o->file, "%s", header.buf);
>> +               strbuf_reset(&header);
>
>  Since the fill_mmfile()s could result in a die maybe it's
>  better if the header is printed before the read attempt?:
>
>              (!textconv_two && diff_filespec_is_binary(two)) )) {
> +               fprintf(o->file, "%s", header.buf);
> +               strbuf_reset(&header);
>                if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
>                        die("unable to read files to diff");
>
> I did this on my work tree and ran 'make' in the test directory and no errors
> were reported.

Hi,

Please have a look at this thread:

http://thread.gmane.org/gmane.comp.version-control.git/147732/

The patch resulting from the thread is currently in next and pu.

Thanks,
Christian.