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"
This commit is contained in:
Junio C Hamano 2015-12-22 13:39:47 -08:00
commit ec3de38da9
2 changed files with 1 additions and 3 deletions

View File

@ -231,8 +231,6 @@ void set_git_work_tree(const char *new_work_tree)
} }
git_work_tree_initialized = 1; git_work_tree_initialized = 1;
work_tree = xstrdup(real_path(new_work_tree)); 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) const char *get_git_work_tree(void)

View File

@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '
test "$SHA" = "$(git rev-list HEAD)" 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 && git init sgd &&
( (
cd sgd && cd sgd &&