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

gitster · gitster · commit af41867169c6 · 2010-12-10T16:12:51.000-08:00
* 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = {`
`87`	`87`	`static void setup_git_env(void)`
`88`	`88`	`{`
`89`	`89`	`git_dir = getenv(GIT_DIR_ENVIRONMENT);`
	`90`	`+ git_dir = git_dir ? xstrdup(git_dir) : NULL;`
`90`	`91`	`if (!git_dir) {`
`91`	`92`	`git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);`
`92`	`93`	`git_dir = git_dir ? xstrdup(git_dir) : NULL;`