diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 16:27:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 16:27:03 -0800 |
| commit | 160ad147fe9f644fc35224095e1d1a01be0208de (patch) | |
| tree | c25abb5c7a1147918763031b0c1b69ba5af3fcfd | |
| parent | t/t0001-init.sh: add test for 'init with init.templatedir set' (diff) | |
| download | tgif-160ad147fe9f644fc35224095e1d1a01be0208de.tar.xz | |
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>
| -rw-r--r-- | 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 aece782a85..09feb1f737 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@@" "$@" |