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 <benoit.person@ensimag.fr> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Benoit Person committed
Jul 4, 2013 at 22:38 UTC
8bade1e12e2041a21f50009d8baaa11bcb800e8f
2 files changed
+2
-1
t/test-lib.sh
+1
@@ -92,6 +92,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
92
print join("\n", @vars);
93
')
94
unset XDG_CONFIG_HOME
95
+unset GITPERLLIB
96
GIT_AUTHOR_EMAIL=author@example.com
97
GIT_AUTHOR_NAME='A U Thor'
98
GIT_COMMITTER_EMAIL=committer@example.com
wrap-for-bin.sh
+1
-1
@@ -14,7 +14,7 @@ else
14
GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
15
export GIT_TEMPLATE_DIR
16
fi
17
-GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'
17
+GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}"
18
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
19
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
20
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR