mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://repo.or.cz/git-gui

Browse Source 
* git://repo.or.cz/git-gui:
  git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
  git-gui (Windows): Switch to relative discovery of oguilib
  git-gui: Correct installation of library to be $prefix/share
  git-gui: Fix gitk search in $PATH to work on Windows
  git-gui: Preserve scroll position on reshow_diff.
  git-gui: Fix the Remote menu separator.
This commit is contained in:
Junio C Hamano
2008-07-30 00:18:26 -07:00
parent c70115b4b1 5fc6edab76
commit 731ab1f55e
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
git-gui/git-gui.sh
View File

@ -317,7 +317,7 @@ proc _git_cmd {name} {
return $v
}
proc _which {what} {
proc _which {what args} {
global env _search_exe _search_path
if {$_search_path eq {}} {
@ -340,8 +340,14 @@ proc _which {what} {
}
}
if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
set suffix {}
} else {
set suffix $_search_exe
}
foreach p $_search_path {
set p [file join $p $what$_search_exe]
set p [file join $p $what$suffix]
if {[file exists $p]} {
return [file normalize $p]
}
@ -1686,7 +1692,7 @@ proc do_gitk {revs} {
# -- Always start gitk through whatever we were loaded with. This
# lets us bypass using shell process on Windows systems.
#
set exe [_which gitk]
set exe [_which gitk -script]
set cmd [list [info nameofexecutable] $exe]
if {$exe eq {}} {
error_popup [mc "Couldn't find gitk in PATH"]
@ -2925,6 +2931,7 @@ if {[is_enabled transport]} {
populate_fetch_menu
set n [expr {[.mbar.remote index end] - $n}]
if {$n > 0} {
if {[.mbar.remote type 0] eq "tearoff"} { incr n }
.mbar.remote insert $n separator
}
unset n