diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-28 21:28:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-28 21:28:36 -0700 |
| commit | b8336519450fdedc8f9cafebc73f7a0226e34e1f (patch) | |
| tree | a2a46314951b7acb2b8f489fe61d43b1572214ee /git-gui/git-gui.sh | |
| parent | config: Change output of --get-regexp for valueless keys (diff) | |
| parent | git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack (diff) | |
| download | tgif-b8336519450fdedc8f9cafebc73f7a0226e34e1f.tar.xz | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
git-gui: Don't nice git blame on MSYS as nice is not supported
git-gui: Don't require $DISPLAY just to get --version
git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
git-gui: Correctly install to /usr/bin on Cygwin
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 97de595f27..4fbc408c4d 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -1,6 +1,12 @@ #!/bin/sh # Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "$@" + if test "z$*" = zversion \ + || test "z$*" = z--version; \ + then \ + echo 'git-gui version @@GITGUI_VERSION@@'; \ + exit; \ + fi; \ + exec wish "$0" -- "$@" set appvers {@@GITGUI_VERSION@@} set copyright { @@ -271,11 +277,6 @@ proc tk_optionMenu {w varName args} { ## ## version check -if {{--version} eq $argv || {version} eq $argv} { - puts "git-gui version $appvers" - exit -} - set req_maj 1 set req_min 5 @@ -1544,8 +1545,7 @@ if {[is_MacOSX]} { # -- Tools Menu # - if {[file exists /usr/local/miga/lib/gui-miga] - && [file exists .pvcsrc]} { + if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} { proc do_miga {} { global ui_status_value if {![lock_index update]} return |