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

Merge branch 'ak/sh-setup-dot-source-i18n-fix'

Browse Source 
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.
This commit is contained in:
Junio C Hamano
2016-10-31 13:15:25 -07:00
parent 2f445c17e5 1073094f30
commit da14d73d5e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-sh-setup.sh
View File

@ -2,9 +2,6 @@
# to set up some variables pointing at the normal git directories and # to set up some variables pointing at the normal git directories and
# a few helper shell functions. # 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 # Having this variable in your environment would break scripts because
# you would cause "cd" to be taken to unexpected places. If you # you would cause "cd" to be taken to unexpected places. If you
# like CDPATH, define it for your interactive shell sessions without # like CDPATH, define it for your interactive shell sessions without
@ -46,6 +43,9 @@ git_broken_path_fix () {
# @@BROKEN_PATH_FIX@@ # @@BROKEN_PATH_FIX@@
# Source git-sh-i18n for gettext support.
. "$(git --exec-path)/git-sh-i18n"
die () { die () {
die_with_status 1 "$@" die_with_status 1 "$@"
} }