Re: [PATCH v4 2/4] test-read-cache: set up repo after git directory
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 23, 2021, 23:42 UTC
- Message-ID
- <xmqq4k82781w.fsf@gitster.g>
- In-Reply-To
- <5bc5e8465ab5fe871965e6c6d578efc51e55b505.1637620958.git.gitgitgadget@gmail.com>
"Lessley Dennington via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 6 quoted lines
> From: Lessley Dennington <lessleydennington@gmail.com> > > Move repo setup to occur after git directory is set up. This will ensure > enabling the sparse index for `diff` (and guarding against the nongit > scenario) will not cause tests to start failing, since that change will include > adding a check to prepare_repo_settings() with the new BUG.
This looks obviously the right thing to do. Would anything break because of the "wrong" ordering of events in the original code?
IOW, can this "bugfix" be protected with a new test against regression?
Show 27 quoted lines
> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
> ---
> t/helper/test-read-cache.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
> index b52c174acc7..0d9f08931a1 100644
> --- a/t/helper/test-read-cache.c
> +++ b/t/helper/test-read-cache.c
> @@ -39,8 +39,6 @@ int cmd__read_cache(int argc, const char **argv)
> int table = 0, expand = 0;
>
> initialize_the_repository();
> - prepare_repo_settings(r);
> - r->settings.command_requires_full_index = 0;
>
> for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
> if (skip_prefix(*argv, "--print-and-refresh=", &name))
> @@ -56,6 +54,9 @@ int cmd__read_cache(int argc, const char **argv)
> setup_git_directory();
> git_config(git_default_config, NULL);
>
> + prepare_repo_settings(r);
> + r->settings.command_requires_full_index = 0;
> +
> for (i = 0; i < cnt; i++) {
> repo_read_index(r);