Merge branch 'lr/git-run-setup-gently'

* lr/git-run-setup-gently:
git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive

diff --combined git.c
index 9efd1a3ec1f2af63fe575f9c755dff685d9b1e51,32f4f6cb899c8b1862c2f7aca3f26b2b8d05968f..778057294892d68b3dee58869cf22265223cab83
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -78,7 -78,7 +78,7 @@@ static int handle_options(const char **
                        if (envchanged)
                                *envchanged = 1;
                } else if (!strcmp(cmd, "--no-replace-objects")) {
 -                      read_replace_refs = 0;
 +                      check_replace_refs = 0;
                        setenv(NO_REPLACE_OBJECTS_ENVIRONMENT, "1", 1);
                        if (envchanged)
                                *envchanged = 1;
@@@ -290,7 -290,7 +290,7 @@@ static int run_builtin(struct cmd_struc
        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);
                }