From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Dec 2010 00:12:51 +0000 (-0800)
Subject: Merge branch 'ks/maint-getenv-fix' into maint
X-Git-Tag: v1.7.3.4~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af41867169c6350e2e73a1bfd8f3f2dd5a17bba6?hp=1a3e302a251ed9fb46be9552e1a2a45c73112bb9

Merge branch 'ks/maint-getenv-fix' into maint

* ks/maint-getenv-fix:
setup: make sure git_dir path is in a permanent buffer, getenv(3) case
---

diff --git a/environment.c b/environment.c
index de5581fe51..18aded6dc4 100644
--- a/environment.c
+++ b/environment.c
@@ -87,6 +87,7 @@ const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = {
 static void setup_git_env(void)
 {
 	git_dir = getenv(GIT_DIR_ENVIRONMENT);
+	git_dir = git_dir ? xstrdup(git_dir) : NULL;
 	if (!git_dir) {
 		git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
 		git_dir = git_dir ? xstrdup(git_dir) : NULL;