[PATCH v6 3/7] test-read-cache: set up repo after git directory
- From
Lessley Dennington via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 6, 2021, 15:55 UTC
- Message-ID
- <7b1fab86a4a15f33b37ac3364a599c3f5237bf21.1638806161.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>
From: Lessley Dennington <lessleydennington@gmail.com>
Move repo setup to occur after git directory is set up. This will protect against test failures in the upcoming change to BUG in prepare_repo_settings if no git directory exists.
Signed-off-by: Lessley Dennington <lessleydennington@gmail.com> Reviewed-by: Elijah Newren <newren@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);
-- gitgitgadget