Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias

gitster · gitster · commit ec3de38da9a8 · 2015-12-22T13:40:12.000-08:00
* nd/stop-setenv-work-tree:
  Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
diff --git 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
@@ -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 &&

Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,6 @@ void set_git_work_tree(const char *new_work_tree)`
`231`	`231`	`}`
`232`	`232`	`git_work_tree_initialized = 1;`
`233`	`233`	`work_tree = xstrdup(real_path(new_work_tree));`
`234`		`- if (setenv(GIT_WORK_TREE_ENVIRONMENT, work_tree, 1))`
`235`		`- die("could not set GIT_WORK_TREE to '%s'", work_tree);`
`236`	`234`	`}`
`237`	`235`
`238`	`236`	`const char *get_git_work_tree(void)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ test_expect_success 'check rev-list' '`
`99`	`99`	`test "$SHA" = "$(git rev-list HEAD)"`
`100`	`100`	`'`
`101`	`101`
`102`		`-test_expect_success 'setup_git_dir twice in subdir' '`
	`102`	`+test_expect_failure 'setup_git_dir twice in subdir' '`
`103`	`103`	`git init sgd &&`
`104`	`104`	`(`
`105`	`105`	`cd sgd &&`