summaryrefslogtreecommitdiff
path: root/test-run-command.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-09-25 03:14:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-25 23:32:35 (GMT)
commitfe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90 (patch)
tree8684d5c1993e6dc8d8312bb8a782b2feacfd878b /test-run-command.c
parent4d0efa101bbbc63d8bd1ec0477f027f23b9f573b (diff)
downloadgit-fe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90.zip
git-fe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90.tar.gz
git-fe9aa0b22e18e5cd1ae4a9323edad0d3c8177c90.tar.bz2
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>
Diffstat (limited to 'test-run-command.c')
0 files changed, 0 insertions, 0 deletions