Merge branch 'jk/trace-fixup'

diff --git a/submodule-config.h b/submodule-config.h
index e4857f53a87d4b8316d53c5f90bc47286179d2c5..d05c542d2cdace181ea72055c0f71db6b1afda42 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -15,9 +15,11 @@ struct submodule {
        const char *url;
        int fetch_recurse;
        const char *ignore;
+       const char *branch;
        struct submodule_update_strategy update_strategy;
        /* the sha1 blob id of the responsible .gitmodules file */
        unsigned char gitmodules_sha1[20];
+       int recommend_shallow;
 };
 
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);