mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'cl/p4-use-diff-tree'
* cl/p4-use-diff-tree: git p4: Use git diff-tree instead of format-patch
This commit is contained in:
commit
feb28ad0a8
|
@ -1311,7 +1311,7 @@ def applyCommit(self, id):
|
|||
else:
|
||||
die("unknown modifier %s for %s" % (modifier, path))
|
||||
|
||||
diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
|
||||
diffcmd = "git diff-tree -p \"%s\"" % (id)
|
||||
patchcmd = diffcmd + " | git apply "
|
||||
tryPatchCmd = patchcmd + "--check -"
|
||||
applyPatchCmd = patchcmd + "--check --apply -"
|
||||
|
|
Loading…
Reference in a new issue