On Fri, 21 Dec 2007 11:50:19 -0800 David Brown <git@xxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
