mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 18:56:10 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2014-05-07 14:39:29 -07:00
parent 1c65d3b9d3 749b668c7d
commit ccfa587787
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -1311,7 +1311,7 @@ def applyCommit(self, id):
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 -"