From: Andrew Waters <apwaters@googlemail.com>
Date: Fri, 22 Oct 2010 12:26:02 +0000 (+0100)
Subject: Fix handling of git-p4 on deleted files
X-Git-Tag: v1.7.3.3~23^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b130262fb7b5d09df2af63f47d9bff1da220bfb;p=git.git

Fix handling of git-p4 on deleted files

Signed-off-by: Andrew Waters <apwaters@googlemail.com>
Tested-by: Thomas Berg <merlin66b@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c1ea643ac..04ce7e3b0 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -706,7 +706,9 @@ class P4Submit(Command):
             submitTemplate = self.prepareLogMessage(template, logMessage)
             if os.environ.has_key("P4DIFF"):
                 del(os.environ["P4DIFF"])
-            diff = p4_read_pipe("diff -du ...")
+            diff = ""
+            for editedFile in editedFiles:
+                diff += p4_read_pipe("diff -du %r" % editedFile)
 
             newdiff = ""
             for newFile in filesToAdd: