Skip to content

Commit

Permalink
Fix handling of git-p4 on deleted files
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Waters <apwaters@googlemail.com>
Tested-by: Thomas Berg <merlin66b@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Andrew Waters authored and Junio C Hamano committed Oct 22, 2010
1 parent d599e04 commit 8b13026
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 8b13026

Please sign in to comment.