diff --git a/git-p4.py b/git-p4.py index 31e71ff8b..fe988cec4 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1308,7 +1308,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 -"