diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 21:06:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 21:06:43 +0200 |
| commit | 22e91ba81538010e471855889b3272195c663d94 (patch) | |
| tree | 4ee15ed8f98b480c37530c5447867bb5827ecea8 /git.c | |
| parent | Merge branch 'fc/mergetools-vimdiff3' (diff) | |
| parent | git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive (diff) | |
| download | git-22e91ba81538010e471855889b3272195c663d94.tar.xz git-22e91ba81538010e471855889b3272195c663d94.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |