Merge branch 'maint-1.5.4' into maint

[git.git] / git-bisect.sh

diff --git a/git-bisect.sh b/git-bisect.sh
index c99ffee122f9d4bd714fb3e6278cafd3e219891b..5177a2a11482af276ae5243c4d550b68bb0e2a28 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -289,14 +289,14 @@ bisect_next() {
        bisect_next_check good
 
        skip=$(git for-each-ref --format='%(objectname)' \
-               "refs/bisect/skip-*" | tr '[\012]' ' ') || exit
+               "refs/bisect/skip-*" | tr '\012' ' ') || exit
 
        BISECT_OPT=''
        test -n "$skip" && BISECT_OPT='--bisect-all'
 
        bad=$(git rev-parse --verify refs/bisect/bad) &&
        good=$(git for-each-ref --format='^%(objectname)' \
-               "refs/bisect/good-*" | tr '[\012]' ' ') &&
+               "refs/bisect/good-*" | tr '\012' ' ') &&
        eval="git rev-list --bisect-vars $BISECT_OPT $good $bad --" &&
        eval="$eval $(cat "$GIT_DIR/BISECT_NAMES")" &&
        eval=$(filter_skipped "$eval" "$skip") &&
@@ -329,9 +329,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