diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-02-14 12:29:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-18 03:27:40 (GMT) |
| commit | 508e84a790bef46881459891748727c490d9a673 (patch) | |
| tree | f300547a60da76afbac00d4d5560eb635960479e /git-bisect.sh | |
| parent | 61b80509e3323c262ed5c45d5340cfa278521a71 (diff) | |
| download | git-508e84a790bef46881459891748727c490d9a673.zip git-508e84a790bef46881459891748727c490d9a673.tar.gz git-508e84a790bef46881459891748727c490d9a673.tar.bz2 | |
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>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 6594a62..74715ed 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 |