[PATCH] wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 3, 2010, 01:11 UTC
- Message-ID
- <7vaauqmcpd.fsf@alter.siamese.dyndns.org>
With bash on some platforms (e.g. FreeBSD 8.0), exporting an unset variable does not "unexport" it. The called process gets an empty string from getenv(3) instead of NULL.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- wrap-for-bin.sh | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh index aece782..09feb1f 100644 --- a/wrap-for-bin.sh +++ b/wrap-for-bin.sh @@ -7,10 +7,15 @@ # @@BUILD_DIR@@ and @@PROG@@. GIT_EXEC_PATH='@@BUILD_DIR@@' -test -z "$NO_SET_GIT_TEMPLATE_DIR" && +if test -n "$NO_SET_GIT_TEMPLATE_DIR" +then + unset GIT_TEMPLATE_DIR +else GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt' + export GIT_TEMPLATE_DIR +fi GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib' PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH" -export GIT_EXEC_PATH GIT_TEMPLATE_DIR GITPERLLIB PATH +export GIT_EXEC_PATH GITPERLLIB PATH exec "${GIT_EXEC_PATH}/@@PROG@@" "$@"
-- 1.7.0.1.288.gffe3c