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

* cl/p4-use-diff-tree:
git p4: Use git diff-tree instead of format-patch

diff --git a/git-p4.py b/git-p4.py
index 06a3cc6122410efcccf0fd77f359ffc2e809aff9..5ea8bb8fc27520cb6874431e827c00821b848b33 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -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 -"