Merge branch 'lr/git-run-setup-gently'

* lr/git-run-setup-gently: git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
git-mirror · Jun 3, 2014 · 22e91ba · 22e91ba
2 parents 3a9dae7 + 27bd38d
commit 22e91ba
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git.c b/git.c
@@ -290,7 +290,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	if (!help) {
 		if (p->option & RUN_SETUP)
 			prefix = setup_git_directory();
-		if (p->option & RUN_SETUP_GENTLY) {
+		else if (p->option & RUN_SETUP_GENTLY) {
 			int nongit_ok;
 			prefix = setup_git_directory_gently(&nongit_ok);
 		}