Skip to content

Commit

Permalink
Merge branch 'ak/sh-setup-dot-source-i18n-fix'
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
gitster committed Oct 31, 2016
2 parents 2f445c1 + 1073094 commit da14d73
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions git-sh-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 "$@"
}
Expand Down

0 comments on commit da14d73

Please sign in to comment.