commit 8b130262fb7b5d09df2af63f47d9bff1da220bfb
author Andrew Waters <apwaters@googlemail.com> Fri Oct 22 13:26:02 2010 +0100
committer Junio C Hamano <gitster@pobox.com> Fri Oct 22 11:51:10 2010 -0700
tree 02e050d83ae42dafda07cf01bc1bd272870ad4b4
parent d599e0484f8ebac8cc50e9557a4c3d246826843d

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>

contrib/fast-import/git-p4

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c1ea643..04ce7e3 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -706,7 +706,9 @@
             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: