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

diff --git a/git-bisect.sh b/git-bisect.sh
index f8857747c4cc5cb3b958e925192e0040157ea911..2c32d0b9ebcdb9bf43124721e109cfac72149990 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -333,9 +333,9 @@ bisect_visualize() {
 
        if test $# = 0
        then
-               case "${DISPLAY+set}" in
+               case "${DISPLAY+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" in
                '')     set git log ;;
-               set)    set gitk ;;
+               set*)   set gitk ;;
                esac
        else
                case "$1" in