test-read-cache: set up repo after git directory

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index b52c174acc7a1f1c8e4c9a3d5a888323c9db0fad..0d9f08931a15f10a546ea2a9840f733cfb9955e0 100644 (file)
--- 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);