Skip to content

Commit

Permalink
wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 3, 2010
1 parent a94d305 commit 160ad14
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions wrap-for-bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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@@" "$@"

0 comments on commit 160ad14

Please sign in to comment.