summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-05 17:42:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-05 17:42:46 (GMT)
commit3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e (patch)
treede988e8ec082d09e74dcd3d67b542c46577f5a35
parent06cfa8a8589740b9dd4820ad1c2eff4b3d968de7 (diff)
parent8b130262fb7b5d09df2af63f47d9bff1da220bfb (diff)
downloadgit-3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e.zip
git-3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e.tar.gz
git-3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e.tar.bz2
Merge branch 'aw/git-p4-deletion'
* aw/git-p4-deletion: Fix handling of git-p4 on deleted files
-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: