diff --git a/git-p4.py b/git-p4.py index cdfa2df5d..4ee673994 100755 --- 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 diff-tree -p \"%s\"" % (id) + diffcmd = "git diff-tree --full-index -p \"%s\"" % (id) patchcmd = diffcmd + " | git apply " tryPatchCmd = patchcmd + "--check -" applyPatchCmd = patchcmd + "--check --apply -"