summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-29 04:32:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-29 04:32:41 (GMT)
commit82ff9d2c8b0d449fbaae21a69bcc3b98a4012180 (patch)
treeca00d88288a844075b41a05b5aa344fecfdd7566 /git-gui/git-gui.sh
parent2b9a50208f2664d228b238affd8496d4d9677d56 (diff)
parent03d25622a5c0f8d0fc4030f3114974d86f20fd61 (diff)
downloadgit-82ff9d2c8b0d449fbaae21a69bcc3b98a4012180.zip
git-82ff9d2c8b0d449fbaae21a69bcc3b98a4012180.tar.gz
git-82ff9d2c8b0d449fbaae21a69bcc3b98a4012180.tar.bz2
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' 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: Quiet our installation process 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-xgit-gui/git-gui.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 3237f3d..9df2e47 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 {
@@ -302,11 +308,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
@@ -1580,8 +1581,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