mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-25 18:01:04 +02:00
Code

git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive

Browse Source 
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>
This commit is contained in:
Luis R. Rodriguez 2014-04-21 17:47:56 -07:00 committed by Junio C Hamano
parent 0bc85abb7a
commit 27bd38d4e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git.c
View File

@ -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);
}