aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-02-14 12:29:58 +0000
committerJunio C Hamano <gitster@pobox.com>2008-02-17 19:27:40 -0800
commit508e84a790bef46881459891748727c490d9a673 (patch)
treef300547a60da76afbac00d4d5560eb635960479e
parent61b80509e3323c262ed5c45d5340cfa278521a71 (diff)
downloadgit-508e84a790bef46881459891748727c490d9a673.tar.gz
git-508e84a790bef46881459891748727c490d9a673.tar.xz
bisect view: check for MinGW32 and MacOSX in addition to X11
When deciding if gitk or git-log should be used to visualize the current state, the environment variable DISPLAY was checked. Now, we check MSYSTEM (for MinGW32/MSys) and SECURITYSESSIONID (for MacOSX) in addition. Note that there is currently no way to ssh into MinGW32, and that SECURITYSESSIONID is not set automatically on MacOSX when ssh'ing into it. So this patch should be safe. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-bisect.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index 6594a6291..74715edf0 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -331,9 +331,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