Merge branch 'jt/no-abuse-alternate-odb-for-submodules'

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 61575e5a5607b02fa0e940f676ae7fea14210e0a..c689070524171b8e6cfae3349cb317c18f693664 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1330,9 +1330,11 @@ struct submodule_parallel_fetch {
 
        struct strbuf submodules_with_errors;
 };
-#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
-                 STRING_LIST_INIT_DUP, \
-                 NULL, 0, 0, STRBUF_INIT}
+#define SPF_INIT { \
+       .args = STRVEC_INIT, \
+       .changed_submodule_names = STRING_LIST_INIT_DUP, \
+       .submodules_with_errors = STRBUF_INIT, \
+}
 
 static int get_fetch_recurse_config(const struct submodule *submodule,
                                    struct submodule_parallel_fetch *spf)
@@ -1906,6 +1908,7 @@ static void submodule_reset_index(const char *path)
 
        strvec_pushf(&cp.args, "--super-prefix=%s%s/",
                     get_super_prefix_or_empty(), path);
+       /* TODO: determine if this might overwright untracked files */
        strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
 
        strvec_push(&cp.args, empty_tree_oid_hex());