global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aw/git-p4-deletion' into next

Browse Source 
* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files
This commit is contained in:
Junio C Hamano
2010-10-26 15:09:00 -07:00
parent cbe69e29b9 8b130262fb
commit 5847c404d3
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)
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: