Re: [PATCH] clone: support 'clone --shared' from a worktree

From: Brandon Williams <bmwill@google.com>
Date: Dec 12, 2017, 00:18 UTC
Message-ID: <20171212001802.GC177995@google.com>
In-Reply-To: <20171211231612.29275-1-sunshine@sunshineco.com>

On 12/11, Eric Sunshine wrote:

Show 31 quoted lines

> 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>
> ---
>  builtin/clone.c         | 3 ++-
>  t/t2025-worktree-add.sh | 6 ++++++
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/builtin/clone.c b/builtin/clone.c
> index b22845738a..6ad0ab3fa4 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -452,7 +452,8 @@ static void clone_local(const char *src_repo, const char *dest_repo)
>  {
>  	if (option_shared) {
>  		struct strbuf alt = STRBUF_INIT;
> -		strbuf_addf(&alt, "%s/objects", src_repo);
> +		get_common_dir(&alt, src_repo);
> +		strbuf_addstr(&alt, "/objects");

If you wanted to do this in one function call you could either use 'strbuf_git_common_path()' or either 'strbuf_git_path()' or 'strbuf_repo_git_path()' which will do the proper path adjustments when working on a path which should be shared between worktrees (i.e. part of the common git dir).

Show 23 quoted lines

>  		add_to_alternates_file(alt.buf);
>  		strbuf_release(&alt);
>  	} else {
> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
> index b5c47ac602..7395973318 100755
> --- a/t/t2025-worktree-add.sh
> +++ b/t/t2025-worktree-add.sh
> @@ -245,6 +245,12 @@ test_expect_success 'local clone from linked checkout' '
>  	( cd here-clone && git fsck )
>  '
>  
> +test_expect_success 'local clone --shared from linked checkout' '
> +	git -C bare worktree add --detach ../baretree &&
> +	git clone --local --shared baretree bare-clone &&
> +	grep /bare/ bare-clone/.git/objects/info/alternates
> +'
> +
>  test_expect_success '"add" worktree with --no-checkout' '
>  	git worktree add --no-checkout -b swamp swamp &&
>  	! test -e swamp/init.t &&
> -- 
> 2.15.1.502.gccaef8de57
>

-- 
Brandon Williams