diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-22 13:39:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-22 13:40:12 -0800 |
| commit | ec3de38da9a89a7f4efba1c9f8fe3fedf6acf654 (patch) | |
| tree | 649ba0bed64755cbc0d8cef69dd9ac0f978413e7 | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| parent | df1e6ea87a58fc8d029efb3041d851f7d6653a1d (diff) | |
| download | git-ec3de38da9a89a7f4efba1c9f8fe3fedf6acf654.tar.gz | |
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"
| -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 03cf5f67a6..61c685b8d9 100644 --- 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 9393322c3e..3eb1127d4b 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 && |