From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 May 2014 21:39:29 +0000 (-0700)
Subject: Merge branch 'cl/p4-use-diff-tree'
X-Git-Tag: v2.0.0-rc3~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccfa587787aa4f3f0990ae45af18b84b55e2c74e?hp=1c65d3b9d3987e9350859bc5c56a944287707d1f

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

Fixes a regression in 1.9.0 with an obviously correct single-liner.

* cl/p4-use-diff-tree:
git-p4: format-patch to diff-tree change breaks binary patches
---

diff --git a/git-p4.py b/git-p4.py
index 8d11b25ae3..773cafcd89 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 -"