summaryrefslogtreecommitdiff
path: root/submodule-config.c
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2016-02-19 09:16:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 17:36:33 (GMT)
commit473166b99078a2724b4fcda11a6a5327b9af60da (patch)
treed20463aea79f73f32735816143441b67e7eca6a5 /submodule-config.c
parent7454ee3c623a6788d91fd3c97af134de33996cfa (diff)
downloadgit-473166b99078a2724b4fcda11a6a5327b9af60da.zip
git-473166b99078a2724b4fcda11a6a5327b9af60da.tar.gz
git-473166b99078a2724b4fcda11a6a5327b9af60da.tar.bz2
config: add 'origin_type' to config_source struct
Use the config origin_type to print more detailed error messages that inform the user about the origin of a config error (file, stdin, blob). Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule-config.c')
-rw-r--r--submodule-config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule-config.c b/submodule-config.c
index b85a937..92502b5 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -427,8 +427,8 @@ 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, rev.buf, config, config_size,
- &parameter);
+ git_config_from_mem(parse_config, "submodule-blob", rev.buf,
+ config, config_size, &parameter);
free(config);
switch (lookup_type) {