From: David Brown <git@davidb.org>
To: Git <git@vger.kernel.org>
Subject: Failed binary detection.
Date: Fri, 21 Dec 2007 11:50:19 -0800 [thread overview]
Message-ID: <20071221195019.GA20668@old.davidb.org> (raw)
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
next reply other threads:[~2007-12-21 19:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-21 19:50 David Brown [this message]
2007-12-21 23:00 ` Failed binary detection Dmitry V. Levin
2007-12-21 23:02 ` Sean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071221195019.GA20668@old.davidb.org \
--to=git@davidb.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox