Commit 03d25622 authored by Shawn O. Pearce's avatar Shawn O. Pearce

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
parents fe813d4e 7e508eb1
......@@ -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/@@[email protected]@/$(GITGUI_VERSION)/g' \
-e 's|@@[email protected]@|'$$GITGUI_RELATIVE'|' \
-e $$GITGUI_RELATIVE's|@@[email protected]@|$(libdir_SQ)|' \
......
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "[email protected]"
if test "z$*" = zversion \
|| test "z$*" = z--version; \
then \
echo 'git-gui version @@[email protected]@'; \
exit; \
fi; \
exec wish "$0" -- "[email protected]"
set appvers {@@[email protected]@}
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
......
......@@ -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 {}} {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment