git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 539c5cda07ae92c929c05e8520ae3e4b820b0ca5..28b9c3c3cba175ce082c2c499488f81369ac858b 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -627,6 +627,8 @@ class P4Submit(Command):
 
         if self.interactive:
             submitTemplate = self.prepareLogMessage(template, logMessage)
+            if os.environ.has_key("P4DIFF"):
+                del(os.environ["P4DIFF"])
             diff = read_pipe("p4 diff -du ...")
 
             for newFile in filesToAdd: