Merge branch 'aw/git-p4-deletion'

* aw/git-p4-deletion: Fix handling of git-p4 on deleted files
14 years ago · 3089c2b97a
1 changed files with 3 additions and 1 deletions
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@ -706,7 +706,9 @@ class P4Submit(Command):
				@@ -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: