git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
A custom diffing utility can be specified for the 'p4 diff' command by setting the P4DIFF environment variable. However when using a custom diffing utility such as 'vimdiff' passing options like -du can cause unexpected behavior. Since the goal is to generate a unified diff of the changes and attach them to the bottom of the p4 submit log we should unset P4DIFF if it has been set in order to generate the diff properly. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Simon Hausmann <simon@lst.de>
Shawn Bohrer committed
Mar 12, 2008 at 19:03 UTC
67abd417165d1e7716d947949f5e5e27318c8a29
1 file changed
+2
contrib/fast-import/git-p4
+2
@@ -627,6 +627,8 @@ class P4Submit(Command):
627
628
if self.interactive:
629
submitTemplate = self.prepareLogMessage(template, logMessage)
630
+ if os.environ.has_key("P4DIFF"):
631
+ del(os.environ["P4DIFF"])
632
diff = read_pipe("p4 diff -du ...")
633
634
for newFile in filesToAdd: