From: Tolga Ceylan <tolga.ceylan@gmail.com>
To: git@vger.kernel.org
Cc: cdleonard@gmail.com, pw@padd.com, gitster@pobox.com
Subject: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches
Date: Tue, 6 May 2014 22:48:54 -0700 [thread overview]
Message-ID: <20140507054854.GA3571@olive> (raw)
When applying binary patches a full index is required. format-patch
already handles this, but diff-tree needs '--full-index' argument
to always output full index. When git-p4 runs git-apply to test
the patch, git-apply rejects the patch due to abbreviated blob
object names. This is the error message git-apply emits in this
case:
error: cannot apply binary patch to '<filename>' without full index line
error: <filename>: patch does not apply
Signed-off-by: Tolga Ceylan <tolga.ceylan@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index cdfa2df..4ee6739 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
else:
die("unknown modifier %s for %s" % (modifier, path))
- diffcmd = "git diff-tree -p \"%s\"" % (id)
+ diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
patchcmd = diffcmd + " | git apply "
tryPatchCmd = patchcmd + "--check -"
applyPatchCmd = patchcmd + "--check --apply -"
--
1.7.9.5
next reply other threads:[~2014-05-07 5:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-07 5:48 Tolga Ceylan [this message]
2014-05-07 17:27 ` [PATCH] git-p4: format-patch to diff-tree change breaks binary patches Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2014-04-25 4:46 Tolga Ceylan
2014-04-26 12:43 ` Pete Wyckoff
2014-04-26 21:12 ` tolga ceylan
2014-04-26 21:31 ` tolga ceylan
2014-05-03 5:40 ` tolga ceylan
2014-05-05 13:14 ` Pete Wyckoff
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=20140507054854.GA3571@olive \
--to=tolga.ceylan@gmail.com \
--cc=cdleonard@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.