From: Simon Hausmann <hausmann@kde.org>
Date: Wed, 21 Mar 2007 09:57:54 +0000 (+0100)
Subject: This should make --apply-as-patch work with deletions (fingers crossed :)
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=f27907b793ee3a2633ff50219f3650b39a3be054;p=python%2Ffast-export.git

This should make --apply-as-patch work with deletions (fingers crossed :)
---

diff --git a/git-p4.py b/git-p4.py
index 2009dce..336c3ea 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -197,7 +197,7 @@ class P4Sync(Command):
                 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)