git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
@ 2010-03-03  1:11 Junio C Hamano
  0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2010-03-03  1:11 UTC (permalink / raw)
  To: Steven Drake; +Cc: git

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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-03-03  1:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-03  1:11 [PATCH] wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).