Failed binary detection.

Failed binary detection.

[David Brown]

A coworker has a branch with some large binary files (video test streams).
Git doesn't seem to be detecting this file is binary, and is causing things
that try to generate diffs to fail.

Specifically, he is unable to rebase his branch, getting an error:

.dotest/patch:3241:LD   := ld
fatal: corrupt patch at line 84682
Patch failed at 0001.

Line 84682 is in the middle of what appear to be the binary contents of the
large media file, with pluses inserted after newline.

Any advice on where to look or possibly how to fix this?

I was able to work around the problem by cherry picking the change instead
of using rebase.  git-format-patch generates a patch that is corrupt in the
same way, which fails with 'git-am'.

Thanks,
Dave

Re: Failed binary detection.

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

On Fri, Dec 21, 2007 at 11:50:19AM -0800, David Brown wrote:
> A coworker has a branch with some large binary files (video test streams).
> Git doesn't seem to be detecting this file is binary, and is causing things
> that try to generate diffs to fail.
> 
> Specifically, he is unable to rebase his branch, getting an error:
> 
> .dotest/patch:3241:LD   := ld
> fatal: corrupt patch at line 84682
> Patch failed at 0001.
> 
> Line 84682 is in the middle of what appear to be the binary contents of the
> large media file, with pluses inserted after newline.
> 
> Any advice on where to look or possibly how to fix this?

See discussion of this issue in git archives, e.g.
http://marc.info/?t=119652720900002


-- 
ldv

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: Failed binary detection.

[Sean]

On Fri, 21 Dec 2007 11:50:19 -0800
David Brown <git@davidb.org> wrote:

> A coworker has a branch with some large binary files (video test streams).
> Git doesn't seem to be detecting this file is binary, and is causing things
> that try to generate diffs to fail.
> 
> Specifically, he is unable to rebase his branch, getting an error:
> 
> .dotest/patch:3241:LD   := ld
> fatal: corrupt patch at line 84682
> Patch failed at 0001.
> 
> Line 84682 is in the middle of what appear to be the binary contents of the
> large media file, with pluses inserted after newline.
> 
> Any advice on where to look or possibly how to fix this?
> 
> I was able to work around the problem by cherry picking the change instead
> of using rebase.  git-format-patch generates a patch that is corrupt in the
> same way, which fails with 'git-am'.
> 

Dave,

Telling Git that the file is binary is likely all you need to do.  Something
like the following line in a .gitattributes file:

filename -diff

For more info see "man gitattributes".

HTH,
Sean