[PATCH v2 2/3] init: do not set core.worktree more often than necessary
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Sep 21, 2016, 11:29 UTC
- Message-ID
- <20160921112939.3444-3-pclouds@gmail.com>
- In-Reply-To
- <20160921112939.3444-1-pclouds@gmail.com>
When "git init" is called with GIT_WORK_TREE environment set, we want to keep this worktree's location in core.worktree so the user does not have to set the environment again and again. See ef6f0af (git-init: set core.worktree if GIT_WORK_TREE is specified - 2007-07-04)
We detect that by this logic (in needs_work_tree_config): normally worktree's top dir would contains ".git" directory, if this is not true, worktree is probably set to elsewhere by the user.
Unfortunately when it calls get_git_dir() it does not take ".git" files into account. When we find a .git file, we immediately follow the file until we find the real ".git" directory. The location of this first ".git" file is lost.
The .git file would satisfy the logic above and not create core.worktree (correct). But because the final .git's location is used, needs_work_tree_config() is misled and creates core.worktree anyway.
This would not be a huge deal normally. But if this happens in a multiple worktree setup it becomes a real problem because up until now, core.worktree will be applied to the main worktree only. If you accidentally do "git init" from a linked worktree, you set core.worktree (for the main repo) pointing to the _linked_ worktree. After that point, may you live in interesting times.
Record the .git file location and use it here.
PS. real_path() resolves symlinks So original_git_dir is not truly original if '.git' is a symlink. Hopefully it's not longer used in favor of .git files.
Noticed-by: Max Nordlund <max.nordlund@sqore.com> Helped-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/init-db.c | 5 ++++- t/t0001-init.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index d5d7558..0d5cc76 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -23,6 +23,7 @@ static int init_is_bare_repository = 0; static int init_shared_repository = -1; static const char *init_db_template_dir; static const char *git_link; +static const char *original_git_dir; static void copy_templates_1(struct strbuf *path, struct strbuf *template, DIR *dir) @@ -263,7 +264,7 @@ static int create_default_files(const char *template_path) /* allow template config file to override the default */ if (log_all_ref_updates == -1) git_config_set("core.logallrefupdates", "true"); - if (needs_work_tree_config(get_git_dir(), work_tree)) + if (needs_work_tree_config(original_git_dir, work_tree)) git_config_set("core.worktree", work_tree); } @@ -314,6 +315,8 @@ static void create_object_directory(void) int set_git_dir_init(const char *git_dir, const char *real_git_dir, int exist_ok) { + original_git_dir = xstrdup(real_path(git_dir)); + if (real_git_dir) { struct stat st; diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 488564b..b8fc588 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -400,9 +400,11 @@ test_expect_success 're-init from a linked worktree' ' test_commit first && git worktree add ../linked-worktree && mv .git/info/exclude expected-exclude && + cp .git/config expected-config && find .git/worktrees -print | sort >expected && git -C ../linked-worktree init && test_cmp expected-exclude .git/info/exclude && + test_cmp expected-config .git/config && find .git/worktrees -print | sort >actual && test_cmp expected actual )
-- 2.8.2.524.g6ff3d78