undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/stop-setenv-work-tree' into maint

Browse Source 
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"
This commit is contained in:
Junio C Hamano 2016-02-05 14:54:07 -08:00
commit d6998341d8
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environment.c
View File

@ -235,8 +235,6 @@ void set_git_work_tree(const char *new_work_tree)
} }
git_work_tree_initialized = 1; git_work_tree_initialized = 1;
work_tree = xstrdup(real_path(new_work_tree)); 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) const char *get_git_work_tree(void)

2
t/t0002-gitfile.sh
View File

@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '
test "$SHA" = "$(git rev-list HEAD)" 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 && git init sgd &&
( (
cd sgd && cd sgd &&