diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-12-21 17:22:52 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-22 13:36:47 -0800 |
| commit | df1e6ea87a58fc8d029efb3041d851f7d6653a1d (patch) | |
| tree | f84a525421c7b26646466f2e85e8586d12fa6479 | |
| parent | d95138e695d99d32dcad528a2a7974f434c51e79 (diff) | |
| download | git-nd/stop-setenv-work-tree.tar.gz | |
Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"nd/stop-setenv-work-tree
This reverts d95138e6 (setup: set env $GIT_WORK_TREE when work tree
is set, like $GIT_DIR, 2015-06-26).
It has caused three regression reports so far.
http://article.gmane.org/gmane.comp.version-control.git/281608
http://article.gmane.org/gmane.comp.version-control.git/281979
http://article.gmane.org/gmane.comp.version-control.git/282691
All of them are about spawning git subprocesses, where the new
presence of GIT_WORK_TREE either changes command behaviour (git-init
or git-clone), or how repo/worktree is detected (from aliases), with
or without $GIT_DIR.
The original bug will be re-fixed another way.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 36fbba57fc..9daa0ba4a3 100644 --- a/environment.c +++ b/environment.c @@ -211,8 +211,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 && |