Merge branch 'maint-2.5' into maint-2.6

diff --git a/submodule.c b/submodule.c
index 5e5a46fe2ab765ff5ecec01a9bc46351fe596837..a458100ed2c2c70e80fd8c4f1cebc23a5ac1c08e 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -129,6 +129,7 @@ static int add_submodule_odb(const char *path)
                goto done;
        }
        /* avoid adding it twice */
+       prepare_alt_odb();
        for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
                if (alt_odb->name - alt_odb->base == objects_directory.len &&
                                !strncmp(alt_odb->base, objects_directory.buf,
@@ -146,7 +147,6 @@ static int add_submodule_odb(const char *path)
 
        /* add possible alternates from the submodule */
        read_info_alternates(objects_directory.buf, 0);
-       prepare_alt_odb();
 done:
        strbuf_release(&objects_directory);
        return ret;