git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
This saves us a few branches when RUN_SETUP is set up. Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Luis R. Rodriguez committed
Apr 21, 2014 at 17:47 UTC
27bd38d4e5a44da233a9e7d01c6a518aba355297
1 file changed
+1
-1
git.c
+1
-1
@@ -290,7 +290,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
290
if (!help) {
291
if (p->option & RUN_SETUP)
292
prefix = setup_git_directory();
293
- if (p->option & RUN_SETUP_GENTLY) {
293
+ else if (p->option & RUN_SETUP_GENTLY) {
294
int nongit_ok;
295
prefix = setup_git_directory_gently(&nongit_ok);
296
}