diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:48:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:48:38 (GMT) |
| commit | 768ededa9c4e804ead6d473d4fe3a8092a77b05c (patch) | |
| tree | 6af33e1d498cf14f80618086adc601331d07fc7e /submodule-config.c | |
| parent | 6b9114c649495bce5f9f88a519672c9d56ee6d81 (diff) | |
| parent | 1b8132d99d80ca98218c2685bbe5ba016a0a42f8 (diff) | |
| download | git-768ededa9c4e804ead6d473d4fe3a8092a77b05c.zip git-768ededa9c4e804ead6d473d4fe3a8092a77b05c.tar.gz git-768ededa9c4e804ead6d473d4fe3a8092a77b05c.tar.bz2 | |
Merge branch 'va/i18n'
More i18n marking.
* va/i18n:
i18n: config: unfold error messages marked for translation
i18n: notes: mark comment for translation
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index faedb1a..d22a851 100644 --- 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, ¶meter); strbuf_release(&rev); free(config); |