@matheusbsbs / matheus-bagliano / commits / b3b05971c1

clone: support 'clone --shared' from a worktree

When worktree functionality was originally implemented, the possibility of 'clone --local' from within a worktree was overlooked, with the result that the location of the "objects" directory of the source repository was computed incorrectly, thus the objects could not be copied or hard-linked by the clone. This shortcoming was addressed by 744e469755 (clone: allow --local from a linked checkout, 2015-09-28). However, the related case of 'clone --shared' (despite being handled only a few lines away from the 'clone --local' case) was not fixed by 744e469755, with a similar result of the "objects" directory location being incorrectly computed for insertion into the 'alternates' file. Fix this. Reported-by: Marc-André Lureau <marcandre.lureau@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Sunshine committed Dec 11, 2017 at 18:16 UTC b3b05971c1e51bb991c768fb8cead2c0501fa93e

2 files changed +8 -1

builtin/clone.c

+2 -1

@@ -423,7 +423,8 @@ static void clone_local(const char *src_repo, const char *dest_repo)

423 {

424 if (option_shared) {

425 struct strbuf alt = STRBUF_INIT;

426 - strbuf_addf(&alt, "%s/objects", src_repo);

426 + get_common_dir(&alt, src_repo);

427 + strbuf_addstr(&alt, "/objects");

428 add_to_alternates_file(alt.buf);

429 strbuf_release(&alt);

430 } else {

t/t2025-worktree-add.sh

@@ -198,4 +198,10 @@ test_expect_success 'local clone from linked checkout' '

198 ( cd here-clone && git fsck )

199 '

200

201 +test_expect_success 'local clone --shared from linked checkout' '

202 + git -C bare worktree add --detach ../baretree &&

203 + git clone --local --shared baretree bare-clone &&

204 + grep /bare/ bare-clone/.git/objects/info/alternates

205 +'

206 +

207 test_done