diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:53 -0800 |
| commit | d82d093456284e1a60db6c91f01a99b47880277f (patch) | |
| tree | 13d6bb68cd2c2985b1aeb099cb8d393f72f0aabc /t/t0002-gitfile.sh | |
| parent | 754884255bb580df159e58defa81cdd30b5c430c (diff) | |
| parent | df1e6ea87a58fc8d029efb3041d851f7d6653a1d (diff) | |
| download | git-d82d093456284e1a60db6c91f01a99b47880277f.tar.gz | |
Merge branch 'nd/stop-setenv-work-tree'
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/t0002-gitfile.sh')
| -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 && |