undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files
This commit is contained in:
Junio C Hamano 2010-11-24 12:46:14 -08:00
commit 385cc9d8c4
1 changed files with 3 additions and 1 deletions
Show Stats 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: