diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-30 00:18:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-30 00:18:26 -0700 |
| commit | 731ab1f55e7ba736b24708a63e93a7c8d581a4d6 (patch) | |
| tree | 602f7ddda98503fda6f2d014ca322beaf79a868f /git-gui/windows | |
| parent | c70115b4b1a8c197b9b829b1fd15d578a3ffcdc3 (diff) | |
| parent | 5fc6edab76ea16c5fad7138389c2fcc2076534e7 (diff) | |
| download | git-731ab1f55e7ba736b24708a63e93a7c8d581a4d6.tar.gz | |
Merge git://repo.or.cz/git-gui
* 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.
Diffstat (limited to 'git-gui/windows')
| -rw-r--r-- | git-gui/windows/git-gui.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/git-gui/windows/git-gui.sh b/git-gui/windows/git-gui.sh index 98f32c0a07..53c3a94686 100644 --- a/git-gui/windows/git-gui.sh +++ b/git-gui/windows/git-gui.sh @@ -8,9 +8,12 @@ if { $argc >=2 && [lindex $argv 0] == "--working-dir" } { incr argc -2 } -set gitguidir [file dirname [info script]] -regsub -all ";" $gitguidir "\\;" gitguidir -set env(PATH) "$gitguidir;$env(PATH)" -unset gitguidir +set bindir [file dirname \ + [file dirname \ + [file dirname [info script]]]] +set bindir [file join $bindir bin] +regsub -all ";" $bindir "\\;" bindir +set env(PATH) "$bindir;$env(PATH)" +unset bindir source [file join [file dirname [info script]] git-gui.tcl] |