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

* aw/git-p4-deletion: Fix handling of git-p4 on deleted files
git-mirror · Nov 24, 2010 · 385cc9d · 385cc9d
2 parents 6cf9bf6 + 8b13026
commit 385cc9d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/contrib/fast-import/git-p4 b/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: