undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cl/p4-use-diff-tree'

Browse Source 
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
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 @@ class P4Submit(Command, P4UserMap):
else: else:
die("unknown modifier %s for %s" % (modifier, path)) 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 " patchcmd = diffcmd + " | git apply "
tryPatchCmd = patchcmd + "--check -" tryPatchCmd = patchcmd + "--check -"
applyPatchCmd = patchcmd + "--check --apply -" applyPatchCmd = patchcmd + "--check --apply -"