Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py
index 2009dce23b0697754226079a1d84554118fc71f2..336c3eab526fc5a8e62028fda3106e03ef798b81 100755 (executable)
--- a/contrib/fast-import/git-p4.py
+++ b/contrib/fast-import/git-p4.py
@@ -197,7 +197,7 @@ def apply(self, id):
                 die("unknown modifier %s for %s" % (modifier, path))
 
         if self.applyAsPatch:
-            system("git-diff-tree -p \"%s^\" \"%s\" | patch -p1" % (id, id))
+            system("git-diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
         else:
             system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
             system("git cherry-pick --no-commit \"%s\"" % id)