[PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jun 26, 2015, 10:37 UTC
- Message-ID
- <1435315055-27011-1-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <CA+cck7GD+JgR4O-XoBeUX1gJAG6suP9iLwASyRygK8hR4KP7pw@mail.gmail.com>
In the test case, we run setup_git_dir_gently() the first time to read $GIT_DIR/config so that we can resolve aliases. We'll enter setup_discovered_git_dir() and may or may not call set_git_dir() near the end of the function, depending on whether the detected git dir is ".git" or not. This set_git_dir() will set env var $GIT_DIR.
For normal repo, git dir detected via setup_discovered_git_dir() will be ".git", and set_git_dir() is not called. If .git file is used however, the git dir can't be ".git" and set_git_dir() is called and $GIT_DIR set. This is the key of this problem.
If we expand an alias (or autocorrect command names), then setup_git_dir_gently() is run the second time. If $GIT_DIR is not set in the first run, we run the same setup_discovered_git_dir() as before. Nothing to see. If it is, however, we'll enter setup_explicit_git_dir() this time.
This is where the "fun" is. The legacy behavior is, if $GIT_WORK_TREE is not set but $GIT_DIR is, cwd is chosen as worktree's top. If you happen to stand at worktree's top when you do this, all is well. If you are in a subdir "foo/bar" (real worktree's top is "foo"), this behavior bites you: your detected worktree is now "foo/bar", but the first run correctly detected worktree as "foo". You get "internal error: work tree has already been set" as a result.
Bottom line is, when $GIT_DIR is set, $GIT_WORK_TREE should be set too unless there's no work tree. But setting $GIT_WORK_TREE inside set_git_dir() may backfire. We don't know at that point if work tree is already configured by the caller. So set it when work tree is detected. It does not harm if $GIT_WORK_TREE is set while $GIT_DIR is not.
Reported-by: Bjørnar Snoksrud <snoksrud@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- environment.c | 2 ++ t/t0002-gitfile.sh | 17 +++++++++++++++++ 2 files changed, 19 insertions(+)
diff --git a/environment.c b/environment.c index 61c685b..8f1b249 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)) + error("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 index 37e9396..9393322 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -99,4 +99,21 @@ test_expect_success 'check rev-list' ' test "$SHA" = "$(git rev-list HEAD)" ' +test_expect_success 'setup_git_dir twice in subdir' ' + git init sgd && + ( + cd sgd && + git config alias.lsfi ls-files && + mv .git .realgit && + echo "gitdir: .realgit" >.git && + mkdir subdir && + cd subdir && + >foo && + git add foo && + git lsfi >actual && + echo foo >expected && + test_cmp expected actual + ) +' + test_done
-- 2.3.0.rc1.137.g477eb31