summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-27 04:36:38 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-06-27 04:36:38 (GMT)
commit03d25622a5c0f8d0fc4030f3114974d86f20fd61 (patch)
tree4fbe35cd50e671e27635843e3474e3b1e4da2706
parentfe813d4e80426971ce17f6ea03f97bc1e26383a1 (diff)
parent7e508eb1a2efce72be1651a35ab3150bfa3c88d6 (diff)
downloadgit-03d25622a5c0f8d0fc4030f3114974d86f20fd61.zip
git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.gz
git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.bz2
Merge branch 'maint'
* maint: 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
-rw-r--r--Makefile2
-rwxr-xr-xgit-gui.sh16
-rw-r--r--lib/blame.tcl6
3 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index d277bb1..1bac6fe 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
fi; \
fi && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
- -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
+ -e 's|^ exec wish "$$0"| exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
-e 's|@@GITGUI_RELATIVE@@|'$$GITGUI_RELATIVE'|' \
-e $$GITGUI_RELATIVE's|@@GITGUI_LIBDIR@@|$(libdir_SQ)|' \
diff --git a/git-gui.sh b/git-gui.sh
index 3237f3d..9df2e47 100755
--- a/git-gui.sh
+++ b/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
diff --git a/lib/blame.tcl b/lib/blame.tcl
index 076233c..b523654 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -487,7 +487,11 @@ method _read_file {fd jump} {
} ifdeleted { catch {close $fd} }
method _exec_blame {cur_w cur_d options cur_s} {
- set cmd [list nice git blame]
+ set cmd [list]
+ if {![is_Windows] || [is_Cygwin]} {
+ lappend cmd nice
+ }
+ lappend cmd git blame
set cmd [concat $cmd $options]
lappend cmd --incremental
if {$commit eq {}} {