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

* cl/p4-use-diff-tree: git p4: Use git diff-tree instead of format-patch
git-mirror · Dec 12, 2013 · feb28ad · feb28ad
2 parents 3497717 + 109efbe
commit feb28ad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 -"