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

gitster · gitster · commit 22e91ba81538 · 2014-06-03T12:06:43.000-07:00
* lr/git-run-setup-gently:
  git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ static int run_builtin(struct cmd_struct p, int argc, const char *argv)`
`290`	`290`	`if (!help) {`
`291`	`291`	`if (p->option & RUN_SETUP)`
`292`	`292`	`prefix = setup_git_directory();`
`293`		`- if (p->option & RUN_SETUP_GENTLY) {`
	`293`	`+ else if (p->option & RUN_SETUP_GENTLY) {`
`294`	`294`	`int nongit_ok;`
`295`	`295`	`prefix = setup_git_directory_gently(&nongit_ok);`
`296`	`296`	`}`