From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:43 +0000 (-0700)
Subject: Merge branch 'lr/git-run-setup-gently'
X-Git-Tag: v2.1.0-rc0~192
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/22e91ba81538010e471855889b3272195c663d94?hp=-c

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

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

22e91ba81538010e471855889b3272195c663d94
diff --combined git.c
index 9efd1a3ec1,32f4f6cb89..7780572948
--- a/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);
  		}