diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
| commit | bb6bc68d226d3dad2f339fe180ed3f6542fe7649 (patch) | |
| tree | cdd2f943a0e0cbab9d6493e9fe5e3eb2f4eb7ff5 | |
| parent | aa22ef8a80997771d8a1f3e329139637e1ee63ec (diff) | |
| parent | 1073094f30a8dd5ae49f2146f587085c4fe86410 (diff) | |
| download | git-bb6bc68d226d3dad2f339fe180ed3f6542fe7649.tar.gz | |
Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint
Recent update to git-sh-setup (a library of shell functions that
are used by our in-tree scripted Porcelain commands) included
another shell library git-sh-i18n without specifying where it is,
relying on the $PATH. This has been fixed to be more explicit by
prefixing $(git --exec-path) output in front.
* ak/sh-setup-dot-source-i18n-fix:
git-sh-setup: be explicit where to dot-source git-sh-i18n from.
| -rw-r--r-- | git-sh-setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index a8a4576342..240c7ebcd1 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -2,9 +2,6 @@ # to set up some variables pointing at the normal git directories and # a few helper shell functions. -# Source git-sh-i18n for gettext support. -. git-sh-i18n - # Having this variable in your environment would break scripts because # you would cause "cd" to be taken to unexpected places. If you # like CDPATH, define it for your interactive shell sessions without @@ -46,6 +43,9 @@ git_broken_path_fix () { # @@BROKEN_PATH_FIX@@ +# Source git-sh-i18n for gettext support. +. "$(git --exec-path)/git-sh-i18n" + die () { die_with_status 1 "$@" } |