Merge branch 'js/nedmalloc-gcc6-warnings'

diff --git a/submodule-config.c b/submodule-config.c
index faedb1a4899639567d8d6d6af75338c26be8f7ae..d22a851d2705fc44c608cdde1c31bea40b454ebb 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -442,7 +442,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
        parameter.commit_sha1 = commit_sha1;
        parameter.gitmodules_sha1 = sha1;
        parameter.overwrite = 0;
-       git_config_from_mem(parse_config, "submodule-blob", rev.buf,
+       git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
                        config, config_size, &parameter);
        strbuf_release(&rev);
        free(config);