[PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This saves us a few branches when RUN_SETUP is set up.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
git.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git.c b/git.c
index 9efd1a3..7780572 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);
}
--
1.9.0