Skip to content

Commit 8b13026

Browse files
Andrew Watersgitster
authored andcommitted
Fix handling of git-p4 on deleted files
Signed-off-by: Andrew Waters <[email protected]> Tested-by: Thomas Berg <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d599e04 commit 8b13026

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

contrib/fast-import/git-p4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,9 @@ class P4Submit(Command):
706706
submitTemplate = self.prepareLogMessage(template, logMessage)
707707
if os.environ.has_key("P4DIFF"):
708708
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)
710712

711713
newdiff = ""
712714
for newFile in filesToAdd:

0 commit comments

Comments
 (0)