Skip to content

Commit bb6bc68

Browse files
committed
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.
2 parents aa22ef8 + 1073094 commit bb6bc68

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-sh-setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# to set up some variables pointing at the normal git directories and
33
# a few helper shell functions.
44

5-
# Source git-sh-i18n for gettext support.
6-
. git-sh-i18n
7-
85
# Having this variable in your environment would break scripts because
96
# you would cause "cd" to be taken to unexpected places. If you
107
# like CDPATH, define it for your interactive shell sessions without
@@ -46,6 +43,9 @@ git_broken_path_fix () {
4643
4744
# @@BROKEN_PATH_FIX@@
4845
46+
# Source git-sh-i18n for gettext support.
47+
. "$(git --exec-path)/git-sh-i18n"
48+
4949
die () {
5050
die_with_status 1 "$@"
5151
}

0 commit comments

Comments
 (0)