mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'va/i18n'

Browse Source 
More i18n marking.

* va/i18n:
  i18n: config: unfold error messages marked for translation
  i18n: notes: mark comment for translation
This commit is contained in:
Junio C Hamano
2016-08-08 14:48:38 -07:00
parent 6b9114c649 1b8132d99d
commit 768ededa9c
4 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodule-config.c
View File

@ -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);