Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit ccfa587

Browse files
committed
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
2 parents 1c65d3b + 749b668 commit ccfa587

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ def applyCommit(self, id):
13111311
else:
13121312
die("unknown modifier %s for %s" % (modifier, path))
13131313

1314-
diffcmd = "git diff-tree -p \"%s\"" % (id)
1314+
diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
13151315
patchcmd = diffcmd + " | git apply "
13161316
tryPatchCmd = patchcmd + "--check -"
13171317
applyPatchCmd = patchcmd + "--check --apply -"

0 commit comments

Comments
 (0)