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>
Andrew Waters committed
Oct 22, 2010 at 13:26 UTC
8b130262fb7b5d09df2af63f47d9bff1da220bfb
1 file changed
+3
-1
contrib/fast-import/git-p4
+3
-1
@@ -706,7 +706,9 @@ class P4Submit(Command):
706
submitTemplate = self.prepareLogMessage(template, logMessage)
707
if os.environ.has_key("P4DIFF"):
708
del(os.environ["P4DIFF"])
709
- diff = p4_read_pipe("diff -du ...")
709
+ diff = ""
710
+ for editedFile in editedFiles:
711
+ diff += p4_read_pipe("diff -du %r" % editedFile)
712
713
newdiff = ""
714
for newFile in filesToAdd: