From 8b130262fb7b5d09df2af63f47d9bff1da220bfb Mon Sep 17 00:00:00 2001
From: Andrew Waters <apwaters@googlemail.com>
Date: Fri, 22 Oct 2010 13:26:02 +0100
Subject: [PATCH] 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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c1ea643ace..04ce7e3b02 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: