Merge branch 'jk/guess-repo-name-regression-fix' into maint

diff --git a/environment.c b/environment.c
index 61c685b8d93091666891f0091d5005fe62543fc2..03cf5f67a61f7f88d47208f79d7e1bdf9bb9fd0e 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -231,6 +231,8 @@ 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)