From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Dec 2015 21:39:47 +0000 (-0800)
Subject: Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
X-Git-Tag: v2.8.0-rc0~118^2~4
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/ec3de38da9a89a7f4efba1c9f8fe3fedf6acf654?hp=24358560c3c0ab51c9ef8178d99f46711716f6c0

Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias

* nd/stop-setenv-work-tree:
Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
---

diff --git a/environment.c b/environment.c
index 03cf5f67a6..61c685b8d9 100644
--- a/environment.c
+++ b/environment.c
@@ -231,8 +231,6 @@ void set_git_work_tree(const char *new_work_tree)
 	}
 	git_work_tree_initialized = 1;
 	work_tree = xstrdup(real_path(new_work_tree));
-	if (setenv(GIT_WORK_TREE_ENVIRONMENT, work_tree, 1))
-		die("could not set GIT_WORK_TREE to '%s'", work_tree);
 }
 
 const char *get_git_work_tree(void)
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 9393322c3e..3eb1127d4b 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '
 	test "$SHA" = "$(git rev-list HEAD)"
 '
 
-test_expect_success 'setup_git_dir twice in subdir' '
+test_expect_failure 'setup_git_dir twice in subdir' '
 	git init sgd &&
 	(
 		cd sgd &&