diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-06 01:54:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-06 01:54:07 +0300 |
| commit | d6998341d8806a1625d375025fecb95346b7dd6d (patch) | |
| tree | 3064f5bcf2128a8be7b8f3216196c0f4851c0be2 | |
| parent | 1b0b6dd0720572dcf90c264aeb91f96a017b0f25 (diff) | |
| parent | df1e6ea87a58fc8d029efb3041d851f7d6653a1d (diff) | |
Merge branch 'nd/stop-setenv-work-tree' into maint
An earlier change in 2.5.x-era broke users' hooks and aliases by
exporting GIT_WORK_TREE to point at the root of the working tree,
interfering when they tried to use a different working tree without
setting GIT_WORK_TREE environment themselves.
* nd/stop-setenv-work-tree:
Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
| -rw-r--r-- | environment.c | 2 | ||||
| -rwxr-xr-x | t/t0002-gitfile.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/environment.c b/environment.c index 2da7fe2e06..1cc4aab4ea 100644 --- a/environment.c +++ b/environment.c @@ -235,8 +235,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 9670e8cbe6..3afe0125c9 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 && |