diff options
author | Tolga Ceylan <tolga.ceylan@gmail.com> | 2014-05-06 22:48:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-07 10:27:22 -0700 |
commit | 749b668c7db563609de3de7595504f2dca8eef7d (patch) | |
tree | 4f20dfc8556c8820771420e9b2aa3ca5c57d4706 /git-p4.py | |
parent | 109efbe4f24b1748f42af52ca6d528b2d7ffe048 (diff) | |
download | git-749b668c7db563609de3de7595504f2dca8eef7d.tar.gz |
git-p4: format-patch to diff-tree change breaks binary patchescl/p4-use-diff-tree
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1308,7 +1308,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 -" |