Skip to content

Commit 8bade1e

Browse files
Benoit Persongitster
Benoit Person
authored andcommitted
wrap-for-bin: make bin-wrappers chainable
For now, bin-wrappers overwrites GITPERLLIB. If we want to chain to those scripts and define GITPERLLIB before, our changes will be discarded. This patch makes the bin-wrappers prepend their modifications to GITPERLLIB rather than redefining it. It also unset GITPERLLIB in the test-suite to prevent broken $GITPERLLIB in the user's configuration from interfering with the testsuite. The codes using GIT_TEMPLATE_DIR and GIT_TEXTDOMAINDIR handle only one path in each of this variable so this new behavior would be useless on those variables. Signed-off-by: Benoit Person <[email protected]> Signed-off-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e191890 commit 8bade1e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

t/test-lib.sh

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
9292
print join("\n", @vars);
9393
')
9494
unset XDG_CONFIG_HOME
95+
unset GITPERLLIB
9596
9697
GIT_AUTHOR_NAME='A U Thor'
9798

wrap-for-bin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ else
1414
GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
1515
export GIT_TEMPLATE_DIR
1616
fi
17-
GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'
17+
GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}"
1818
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
1919
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
2020
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR

0 commit comments

Comments
 (0)