threads / discuss / 11386

Failed binary detection.

Subject: Failed binary detection.

## tl;dr

3 messages between Dec 21, 2007 and Dec 21, 2007.

replies: 2people: 3as markdown or json

David Brown· Dec 21, 2007, 19:50 UTC · lore

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

Dmitry V. Levin· Dec 21, 2007, 23:00 UTC · re: David Brown · lore

Re: Failed binary detection.

On Fri, Dec 21, 2007 at 11:50:19AM -0800, David Brown wrote:

Show 14 quoted lines

> 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

Sean· Dec 21, 2007, 23:02 UTC · re: David Brown · lore

Re: Failed binary detection.

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

Show 19 quoted lines

> 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