summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waters <apwaters@googlemail.com>2010-10-22 12:26:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-22 18:51:10 (GMT)
commit8b130262fb7b5d09df2af63f47d9bff1da220bfb (patch)
tree02e050d83ae42dafda07cf01bc1bd272870ad4b4
parentd599e0484f8ebac8cc50e9557a4c3d246826843d (diff)
downloadgit-8b130262fb7b5d09df2af63f47d9bff1da220bfb.zip
git-8b130262fb7b5d09df2af63f47d9bff1da220bfb.tar.gz
git-8b130262fb7b5d09df2af63f47d9bff1da220bfb.tar.bz2
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>
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 3 insertions, 1 deletions
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: