setup_git_directory_gently: do not barf when GIT_DIR is given.

matled · Junio C Hamano · commit 41e95f699088 · 2006-07-30T17:45:57.000-07:00
Earlier we barfed when GIT_DIR environment variable points at a
directory yet to be created, which made it impossible to use
configuration mechanism in "git-init-db".

Signed-off-by: Matthias Lederhofer &lt;matled@gmx.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/setup.c b/setup.c
@@ -184,6 +184,10 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		}
 		return NULL;
 	bad_dir_environ:
+		if (!nongit_ok) {
+			*nongit_ok = 1;
+			return NULL;
+		}
 		path[len] = 0;
 		die("Not a git repository: '%s'", path);
 	}

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,10 @@ const char setup_git_directory_gently(int nongit_ok)`
`184`	`184`	`}`
`185`	`185`	`return NULL;`
`186`	`186`	`bad_dir_environ:`
	`187`	`+ if (!nongit_ok) {`
	`188`	`+ *nongit_ok = 1;`
	`189`	`+ return NULL;`
	`190`	`+ }`
`187`	`191`	`path[len] = 0;`
`188`	`192`	`die("Not a git repository: '%s'", path);`
`189`	`193`	`}`