summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:14 (GMT)
commita3f4eb1b40457d85ab63168b621e71eaf73bb3c4 (patch)
tree820a0708317f463df97523b117806be63cb1e709 /environment.c
parent54d673f25d571ac2d8f50b1ccea4a7d69ca8a056 (diff)
parentd95138e695d99d32dcad528a2a7974f434c51e79 (diff)
downloadgit-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.zip
git-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.tar.gz
git-a3f4eb1b40457d85ab63168b621e71eaf73bb3c4.tar.bz2
Merge branch 'nd/export-worktree'
Running an aliased command from a subdirectory when the .git thing in the working tree is a gitfile pointing elsewhere did not work. * nd/export-worktree: setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 01cb28d..a533aed 100644
--- a/environment.c
+++ b/environment.c
@@ -237,6 +237,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)