Skip to content

Commit df1e6ea

Browse files
pcloudsgitster
authored andcommitted
Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
This reverts d95138e (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d95138e commit df1e6ea

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

environment.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ void set_git_work_tree(const char *new_work_tree)
211211
}
212212
git_work_tree_initialized = 1;
213213
work_tree = xstrdup(real_path(new_work_tree));
214-
if (setenv(GIT_WORK_TREE_ENVIRONMENT, work_tree, 1))
215-
die("could not set GIT_WORK_TREE to '%s'", work_tree);
216214
}
217215

218216
const char *get_git_work_tree(void)

t/t0002-gitfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '
9999
test "$SHA" = "$(git rev-list HEAD)"
100100
'
101101

102-
test_expect_success 'setup_git_dir twice in subdir' '
102+
test_expect_failure 'setup_git_dir twice in subdir' '
103103
git init sgd &&
104104
(
105105
cd sgd &&

0 commit comments

Comments
 (0)