Permalink
Browse files

Merge branch 'aw/git-p4-deletion'

* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files
  • Loading branch information...
2 parents 06cfa8a + 8b13026 commit 3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e @gitster gitster committed Nov 5, 2010
Showing with 3 additions and 1 deletion.
  1. +3 −1 contrib/fast-import/git-p4
@@ -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:

0 comments on commit 3089c2b

Please sign in to comment.