From 8b130262fb7b5d09df2af63f47d9bff1da220bfb Mon Sep 17 00:00:00 2001 From: Andrew Waters Date: Fri, 22 Oct 2010 13:26:02 +0100 Subject: Fix handling of git-p4 on deleted files Signed-off-by: Andrew Waters Tested-by: Thomas Berg Signed-off-by: Junio C Hamano 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 @@ 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: -- cgit v0.10.2-6-g49f6