summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-07 14:39:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-07 14:39:29 -0700
commitccfa587787aa4f3f0990ae45af18b84b55e2c74e (patch)
tree4dfea9032aa4d2ca653224bd4f29c2bcc7e23efe /git-p4.py
parent1c65d3b9d3987e9350859bc5c56a944287707d1f (diff)
parent749b668c7db563609de3de7595504f2dca8eef7d (diff)
downloadgit-ccfa587787aa4f3f0990ae45af18b84b55e2c74e.tar.gz
Merge branch 'cl/p4-use-diff-tree'
Fixes a regression in 1.9.0 with an obviously correct single-liner. * cl/p4-use-diff-tree: git-p4: format-patch to diff-tree change breaks binary patches
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 8d11b25ae3..773cafcd89 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 -"