summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-19 14:41:30 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-19 14:41:30 -0700
commit25a294e44db1c479e8abe2449f71279e6511ea32 (patch)
treeb77ff79cf66660d1db638d02135e982f1bf01999 /environment.c
parentf9610bcae907a38636174a688c1aa89c63cc9c1a (diff)
parentd95138e695d99d32dcad528a2a7974f434c51e79 (diff)
downloadgit-25a294e44db1c479e8abe2449f71279e6511ea32.tar.gz
Merge branch 'nd/export-worktree' into maint
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 61c685b8d9..03cf5f67a6 100644
--- 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)