diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-07-25 15:08:33 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-07-25 15:08:33 -0700 |
| commit | 7838d3fb41ed7d738e2cbdf8e4f40f0367f4f46f (patch) | |
| tree | 5745a0d237d6882bf65f62d0cf5c49473a524e11 | |
| parent | 15430be5a1d17b888b45b608daab7573f24cf9f1 (diff) | |
| download | git-7838d3fb41ed7d738e2cbdf8e4f40f0367f4f46f.tar.gz git-7838d3fb41ed7d738e2cbdf8e4f40f0367f4f46f.tar.xz | |
git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
In Git 1.6 and later gitk is in $prefix/bin while git-gui and all
of the other commands are in $gitexecdir, which is typically not
the same as $prefix/bin. So we cannot launch $gitexecdir/gitk and
expect it to actually start gitk properly.
By allowing git-gui to locate the script via $PATH and then using
exactly that path when we source it during the application start
we can correctly run gitk on any Git 1.5 or later.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | macosx/AppMain.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/AppMain.tcl b/macosx/AppMain.tcl index 41ca08e2b..ddbe6334a 100644 --- a/macosx/AppMain.tcl +++ b/macosx/AppMain.tcl @@ -7,7 +7,7 @@ if {[string first -psn [lindex $argv 0]] == 0} { } if {[file tail [lindex $argv 0]] eq {gitk}} { - set argv0 [file join $gitexecdir gitk] + set argv0 [lindex $argv 0] set AppMain_source $argv0 } else { set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]] |