summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:43 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:43 -0700
commit22e91ba81538010e471855889b3272195c663d94 (patch)
tree4ee15ed8f98b480c37530c5447867bb5827ecea8 /git.c
parent3a9dae783bb66c18409d42d07949456dde8c4c62 (diff)
parent27bd38d4e5a44da233a9e7d01c6a518aba355297 (diff)
downloadgit-22e91ba81538010e471855889b3272195c663d94.tar.gz
Merge branch 'lr/git-run-setup-gently'
* lr/git-run-setup-gently: git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 9efd1a3ec1..7780572948 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);
}