diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:07 -0800 |
| commit | d6998341d8806a1625d375025fecb95346b7dd6d (patch) | |
| tree | 3064f5bcf2128a8be7b8f3216196c0f4851c0be2 /t | |
| parent | 1b0b6dd0720572dcf90c264aeb91f96a017b0f25 (diff) | |
| parent | df1e6ea87a58fc8d029efb3041d851f7d6653a1d (diff) | |
| download | git-d6998341d8806a1625d375025fecb95346b7dd6d.tar.gz | |
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"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0002-gitfile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |