mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of git-p4 on deleted files

Browse Source 
Signed-off-by: Andrew Waters <apwaters@googlemail.com>
Tested-by: Thomas Berg <merlin66b@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrew Waters
2010-10-22 13:26:02 +01:00
committed by Junio C Hamano
parent d599e0484f
commit 8b130262fb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/fast-import/git-p4
View File

@ -706,7 +706,9 @@ class P4Submit(Command):
submitTemplate = self.prepareLogMessage(template, logMessage) submitTemplate = self.prepareLogMessage(template, logMessage)
if os.environ.has_key("P4DIFF"): if os.environ.has_key("P4DIFF"):
del(os.environ["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 = "" newdiff = ""
for newFile in filesToAdd: for newFile in filesToAdd: