mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
03d25622a5
2
Makefile
2
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)|' \
|
||||
|
|
16
git-gui.sh
16
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
|
||||
|
|
|
@ -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 {}} {
|
||||
|
|
Loading…
Reference in a new issue