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 03cf5f67a61f7f88d47208f79d7e1bdf9bb9fd0e..61c685b8d93091666891f0091d5005fe62543fc2 100644 (file)
--- 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 9393322c3e7028ea7074d2b1ec50fbb293c6728f..3eb1127d4b66dff72a9dda5ec52771f5cec4af8d 100755 (executable)
--- 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 &&