Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	This patch is just here to demonstrate how a core.bare = true / 
	core.worktree conflict could be caught.

	Personally, I do not deem it worth the effort, as can be seen by 
	the lack of adjustments to t1501, which fails utterly with this 
	patch.

 environment.c |    3 +--
 setup.c       |    8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/environment.c b/environment.c
index 2af12fd..4c5db32 100644
--- a/environment.c
+++ b/environment.c
@@ -82,8 +82,7 @@ const char *get_git_work_tree(void)
 	static int initialized = 0;
 	if (!initialized) {
 		work_tree = getenv(GIT_WORK_TREE_ENVIRONMENT);
-		/* core.bare = true overrides implicit and config work tree */
-		if (!work_tree && is_bare_repository_cfg < 1) {
+		if (!work_tree) {
 			work_tree = git_work_tree_cfg;
 			/* make_absolute_path also normalizes the path */
 			if (work_tree && !is_absolute_path(work_tree))
diff --git a/setup.c b/setup.c
index 8237fe3..b0febed 100644
--- a/setup.c
+++ b/setup.c
@@ -342,13 +342,17 @@ int check_repository_format_version(const char *var, const char *value)
 		shared_repository = git_config_perm(var, value);
 	else if (strcmp(var, "core.bare") == 0) {
 		is_bare_repository_cfg = git_config_bool(var, value);
-		if (is_bare_repository_cfg == 1)
-			inside_work_tree = -1;
+		if (is_bare_repository_cfg == 1 && inside_work_tree < 0)
+			die ("Contradicting config settings for "
+				"bare and worktree");
 	} else if (strcmp(var, "core.worktree") == 0) {
 		if (git_work_tree_cfg)
 			free(git_work_tree_cfg);
 		git_work_tree_cfg = xstrdup(value);
 		inside_work_tree = -1;
+		if (is_bare_repository_cfg == 1)
+			die ("Contradicting config settings for "
+				"bare and worktree");
 	}
 	return 0;
 }
-- 
1.5.3.rc3.28.g1406


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html