Re: [PATCH 3/3] init: do not set core.worktree more often than necessary

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 8, 2016, 19:54 UTC
Message-ID: <xmqqbmzygoat.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160908134719.27955-4-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:

Show 7 quoted lines

> +/*
> + * Return the first ".git" that we have encountered.
> + * FIXME this function for not entirely correct because
> + * setup_git_directory() and enter_repo() do not update first_git_dir
> + * when they follow .git files. The function in its current state is
> + * only suitable for "git init".
> + */

Would it be possible to move this to "init-db.c" then?

The very first thing cmd_init_db() does to what is in the environment.c is to call set_git_dir() via set_git_dir_init() to tell it where the ".git" thing is, no? Can't that code remember the location itself, instead of adding code that is known not to be usable by other callers? That would help avoiding the future confusion.

Show 24 quoted lines

> +const char *get_first_git_dir(void)
> +{
> +	return first_git_dir ? first_git_dir : git_dir;
> +}
> +
>  const char *get_git_common_dir(void)
>  {
>  	return git_common_dir;
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index 393c940..d59669a 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -393,9 +393,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
>  	)