# [PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive 2 messages from 2014-04-22 to 2014-04-22. Participants: Luis R. Rodriguez, Junio C Hamano. Thread: https://gitlist.dev/t/36468 ## Luis R. Rodriguez, 2014-04-22 00:47 Subject: [PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive Message-ID: <1398127676-12311-1-git-send-email-mcgrof@do-not-panic.com> URL: https://gitlist.dev/e/1398127676-12311-1-git-send-email-mcgrof%40do-not-panic.com ``` From: "Luis R. Rodriguez" This saves us a few branches when RUN_SETUP is set up. Signed-off-by: Luis R. Rodriguez --- 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 ``` ## Junio C Hamano, 2014-04-22 19:37 Subject: Re: [PATCH] git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive Message-ID: URL: https://gitlist.dev/e/xmqqvbu140lh.fsf%40gitster.dls.corp.google.com In-Reply-To: <1398127676-12311-1-git-send-email-mcgrof@do-not-panic.com> ``` "Luis R. Rodriguez" writes: > From: "Luis R. Rodriguez" > > This saves us a few branches when RUN_SETUP is set up. > > Signed-off-by: Luis R. Rodriguez > --- Makes sense, especially because there is no sane reason to set both bits on. > 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); > } ```