diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-18 18:35:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-18 18:35:48 -0700 |
| commit | 1eb0545cce4a4ed652425798b87cb0e777c03b3f (patch) | |
| tree | fc20c82e2f05a9d6f510481b8eeb3481054975bc /git-gui/macosx | |
| parent | 3d6bc9a763f56156b424e7382b4029a67a49847e (diff) | |
| parent | 4498b3a50a0e839788682f672df267cbc1ba9292 (diff) | |
| download | git-1eb0545cce4a4ed652425798b87cb0e777c03b3f.tar.gz | |
Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui
git-gui 0.20.0
* tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui:
git-gui: set version 0.20
git-gui: sv.po: Update Swedish translation (547t0f0u)
git-gui i18n: Updated Bulgarian translation (547t,0f,0u)
git-gui: Makes chooser set 'gitdir' to the resolved path
git-gui: Fixes chooser not accepting gitfiles
git-gui: reinstate support for Tcl 8.4
git-gui: fix problem with gui.maxfilesdisplayed
git-gui: fix verbose loading when git path contains spaces.
git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows
git-gui: add configurable tab size to the diff view
git-gui: Make git-gui lib dir configurable at runime
git-gui i18n: Updated Bulgarian translation (520t,0f,0u)
L10n: vi.po (543t): Init translation for Vietnamese
git-gui: align the new recursive checkbox with the radiobuttons.
git-gui: Add a 'recursive' checkbox in the clone menu.
Diffstat (limited to 'git-gui/macosx')
| -rw-r--r-- | git-gui/macosx/AppMain.tcl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-gui/macosx/AppMain.tcl b/git-gui/macosx/AppMain.tcl index 738bdd03ed..b6c6dc3500 100644 --- a/git-gui/macosx/AppMain.tcl +++ b/git-gui/macosx/AppMain.tcl @@ -1,5 +1,10 @@ set gitexecdir {@@gitexecdir@@} -set gitguilib {@@GITGUI_LIBDIR@@} +if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { + set gitguilib $::env(GIT_GUI_LIB_DIR) +} else { + set gitguilib {@@GITGUI_LIBDIR@@} +} + set env(PATH) "$gitexecdir:$env(PATH)" if {[string first -psn [lindex $argv 0]] == 0} { |