Merge branch 'nd/git-dir-pointing-at-gitfile'

gitster · gitster · commit 01e0fa2b3742 · 2013-09-18T11:42:36.000-07:00
We made sure that we notice the user-supplied GIT_DIR is actually a
gitfile, but did not do the same when the default ".git" is a gitfile.

* nd/git-dir-pointing-at-gitfile:
  Make setup_git_env() resolve .git file when $GIT_DIR is not specified
diff --git a/environment.c b/environment.c
@@ -123,14 +123,13 @@ static char *expand_namespace(const char *raw_namespace)
 
 static void setup_git_env(void)
 {
+	const char *gitfile;
+
 	git_dir = getenv(GIT_DIR_ENVIRONMENT);
-	git_dir = git_dir ? xstrdup(git_dir) : NULL;
-	if (!git_dir) {
-		git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);
-		git_dir = git_dir ? xstrdup(git_dir) : NULL;
-	}
 	if (!git_dir)
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
+	gitfile = read_gitfile(git_dir);
+	git_dir = xstrdup(gitfile ? gitfile : git_dir);
 	git_object_dir = getenv(DB_ENVIRONMENT);
 	if (!git_object_dir) {
 		git_object_dir = xmalloc(strlen(git_dir) + 9);
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
@@ -379,6 +379,10 @@ test_expect_success 'init with separate gitdir' '
 	test -d realgitdir/refs
 '
 
+test_expect_success 're-init on .git file' '
+	( cd newdir && git init )
+'
+
 test_expect_success 're-init to update git link' '
 	(
 	cd newdir &&

Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,10 @@ test_expect_success 'init with separate gitdir' '`
`379`	`379`	`test -d realgitdir/refs`
`380`	`380`	`'`
`381`	`381`
	`382`	`+test_expect_success 're-init on .git file' '`
	`383`	`+ ( cd newdir && git init )`
	`384`	`+'`
	`385`	`+`
`382`	`386`	`test_expect_success 're-init to update git link' '`
`383`	`387`	`(`
`384`	`388`	`cd newdir &&`