From: Carl Worth <cworth@cworth.org>
To: git@vger.kernel.org
Subject: Why is there a --binary option needed for git-apply?
Date: Tue, 05 Sep 2006 11:40:53 -0700 [thread overview]
Message-ID: <874pvmxikq.wl%cworth@cworth.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]
I was recently emailed a patch that introduced some new binary files
to my repository. The patch included a very pleasant-looking chunk
along the lines of:
diff --git a/new/file.png b/new/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7edd8141e15f5753ea94244e7315bd1341a8c05
GIT binary patch
I tried applying the patch with git-apply (1.4.2.rc2.gef1d9) and
received an inscrutable error:
fatal: patch with only garbage at line 90
Where line 90 happened to be the line after the first chunk.
I was disappointed that the operation had failed and started guessing
at problem causes (git version incompatibilities? MUA whitespace
munging?).
Shawn Pearce was kind enough to direct me to the --binary option for
git-apply which solved my problem. But that left me wondering why
git-apply requires this extra command-line option to do its
job. Shouldn't git-apply simply apply the patch it is given?
If there is some reason for git-apply to only apply binary patches
when under the duress of --binary, then at the very least it could use
a better error message explaining the situation.
-Carl
--
cworth@redhat.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2006-09-05 18:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-05 18:40 Carl Worth [this message]
2006-09-06 3:38 ` Why is there a --binary option needed for git-apply? Shawn Pearce
2006-09-07 6:45 ` Junio C Hamano
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=874pvmxikq.wl%cworth@cworth.org \
--to=cworth@cworth.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;
as well as URLs for NNTP newsgroup(s).