@matheusbsbs / matheus-bagliano / commits / fe9aa0b22e

init: correct re-initialization from a linked worktree

When 'git init' is called from a linked worktree, we treat '.git' dir (which is $GIT_COMMON_DIR/worktrees/something) as the main '.git' (i.e. $GIT_COMMON_DIR) and populate the whole repository skeleton in there. It does not harm anything (*) but it is still wrong. Since 'git init' calls set_git_dir() at preparation time, which indirectly calls get_common_dir() and correctly detects multiple worktree setup, all git_path_buf() calls in create_default_files() will return correct paths in both single and multiple worktree setups. The only thing left is copy_templates(), which targets $GIT_DIR, not $GIT_COMMON_DIR. Fix that with get_git_common_dir(). This function will return $GIT_DIR in single-worktree setup, so we don't have to make a special case for multiple-worktree here. (*) It does in fact, thanks to another bug. More on that later. 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Sep 25, 2016 at 10:14 UTC fe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90

2 files changed +16 -1

builtin/init-db.c

+1 -1

@@ -138,7 +138,7 @@ static void copy_templates(const char *template_dir)

138 goto close_free_return;

139 }

140

141 - strbuf_addstr(&path, get_git_dir());

141 + strbuf_addstr(&path, get_git_common_dir());

142 strbuf_complete(&path, '/');

143 copy_templates_1(&path, &template_path, dir);

144 close_free_return:

t/t0001-init.sh

+15

@@ -393,4 +393,19 @@ test_expect_success 'remote init from does not use config from cwd' '

393 test_cmp expect actual

394 '

395

396 +test_expect_success 're-init from a linked worktree' '

397 + git init main-worktree &&

398 + (

399 + cd main-worktree &&

400 + test_commit first &&

401 + git worktree add ../linked-worktree &&

402 + mv .git/info/exclude expected-exclude &&

403 + find .git/worktrees -print | sort >expected &&

404 + git -C ../linked-worktree init &&

405 + test_cmp expected-exclude .git/info/exclude &&

406 + find .git/worktrees -print | sort >actual &&

407 + test_cmp expected actual

408 + )

409 +'

410 +

411 test_done