From 27bd38d4e5a44da233a9e7d01c6a518aba355297 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 21 Apr 2014 17:47:56 -0700 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.c b/git.c index 7cf2953eff..32f4f6cb89 100644 --- 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); } -- GitLab