summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Luis R. Rodriguez <mcgrof@suse.com>2014-04-21 17:47:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-22 12:37:02 -0700
commit27bd38d4e5a44da233a9e7d01c6a518aba355297 (patch)
treedb3caab918a29c5401383081b8e842ecef31512f
parentGit 1.9.2 (diff)
downloadtgif-27bd38d4e5a44da233a9e7d01c6a518aba355297.tar.xz
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>
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
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);
}