From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Mar 2010 00:27:03 +0000 (-0800)
Subject: wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
X-Git-Tag: v1.7.1-rc0~72^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=160ad147fe9f644fc35224095e1d1a01be0208de;p=git.git

wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR

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>
---

diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index aece782a8..09feb1f73 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@@" "$@"