[PATCH] git-p4: format-patch to diff-tree change breaks binary patches

From: Tolga Ceylan <tolga.ceylan@gmail.com>
Date: Apr 25, 2014, 04:46 UTC
Message-ID: <20140425044618.GA7058@olive>

When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index.

Signed-off-by: Tolga Ceylan <tolga.ceylan@gmail.com>
---
 git-p4.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index cdfa2df..4ee6739 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
             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 -"

-- 
1.7.9.5