git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
authorShawn Bohrer <shawn.bohrer@gmail.com>
Thu, 13 Mar 2008 00:03:23 +0000 (19:03 -0500)
committerSimon Hausmann <simon@lst.de>
Thu, 13 Mar 2008 07:57:29 +0000 (08:57 +0100)
commit67abd417165d1e7716d947949f5e5e27318c8a29
tree7966edc1df208b65c75ddce9f3302f1baf59b21c
parent8ff45f2af5b25b7581072ee7896f4285dfc034ea
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>
contrib/fast-import/git-p4