git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive

mcgrof · gitster · commit 27bd38d4e5a4 · 2014-04-22T12:37:02.000-07:00
This saves us a few branches when RUN_SETUP is set up.

Signed-off-by: Luis R. Rodriguez &lt;mcgrof@suse.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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`	`}`