git/submodule-config.c, branch v2.10.2

Merge branch 'sb/submodule-update-dot-branch'

2016-08-10T19:33:20Z

A few updates to "git submodule update". Use of "| wc -l" break with BSD variant of 'wc'. * sb/submodule-update-dot-branch: t7406: fix breakage on OSX submodule update: allow '.' for branch value submodule--helper: add remote-branch helper submodule-config: keep configured branch around submodule--helper: fix usage string for relative-path submodule update: narrow scope of local variable submodule update: respect depth in subsequent fetches t7406: future proof tests with hard coded depth

Merge branch 'va/i18n'

2016-08-08T21:48:38Z

More i18n marking. * va/i18n: i18n: config: unfold error messages marked for translation i18n: notes: mark comment for translation

Merge branch 'rs/submodule-config-code-cleanup'

2016-08-03T22:10:28Z

Code cleanup. * rs/submodule-config-code-cleanup: submodule-config: fix test binary crashing when no arguments given submodule-config: combine early return code into one goto submodule-config: passing name reference for .gitmodule blobs submodule-config: use explicit empty string instead of strbuf in config_from()

submodule-config: keep configured branch around

2016-08-01T21:42:07Z

The branch field will be used in a later patch by `submodule update`. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

submodule-config: combine early return code into one goto

2016-07-28T20:05:31Z

So we have simpler return handling code and all the cleanup code in almost one place. Signed-off-by: Heiko Voigt Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano

submodule-config: passing name reference for .gitmodule blobs

2016-07-28T20:05:14Z

Commit 959b5455 (submodule: implement a config API for lookup of .gitmodules values, 2015-08-18) implemented the initial version of the submodule config cache. During development of that initial version we extracted the function gitmodule_sha1_from_commit(). During that process we missed that the strbuf rev was still used in config_from() and now is left empty. Lets fix this by also returning this string. This means that now when reading .gitmodules from revisions, the error messages also contain a reference to the blob they are from. Signed-off-by: Heiko Voigt Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano

i18n: config: unfold error messages marked for translation

2016-07-28T16:11:09Z

Introduced in 473166b ("config: add 'origin_type' to config_source struct", 2016-02-19), Git can inform the user about the origin of a config error, but the implementation does not allow translators to translate the keywords 'file', 'blob, 'standard input', and 'submodule-blob'. Moreover, for the second message, a reason for the error is appended to the message, not allowing translators to translate that reason either. Unfold the message into several templates for each known origin_type. That would result in better translation at the expense of code verbosity. Add enum config_oringin_type to ease management of the various configuration origin types (blob, file, etc). Previously origin type was considered from command line if cf->origin_type == NULL, i.e., uninitialized. Now we set origin_type to CONFIG_ORIGIN_CMDLINE in git_config_from_parameters() and configset_add_value(). For error message in git_parse_source(), use xstrfmt() function to prepare the message string, instead of doing something like it's done for die_bad_number(), because intelligibility and code conciseness are improved for that instance. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

Merge branch 'bc/cocci'

2016-07-19T20:22:16Z

Conversion from unsigned char sha1[20] to struct object_id continues. * bc/cocci: diff: convert prep_temp_blob() to struct object_id merge-recursive: convert merge_recursive_generic() to object_id merge-recursive: convert leaf functions to use struct object_id merge-recursive: convert struct merge_file_info to object_id merge-recursive: convert struct stage_data to use object_id diff: rename struct diff_filespec's sha1_valid member diff: convert struct diff_filespec to struct object_id coccinelle: apply object_id Coccinelle transformations coccinelle: convert hashcpy() with null_sha1 to hashclr() contrib/coccinelle: add basic Coccinelle transforms hex: add oid_to_hex_r()

submodule-config: use explicit empty string instead of strbuf in config_from()

2016-07-19T19:16:57Z

Use a string constant instead of an empty strbuf to shorten the code and make it easier to read. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

coccinelle: convert hashcpy() with null_sha1 to hashclr()

2016-06-28T18:39:02Z

hashcpy with null_sha1 as the source is equivalent to hashclr. In addition to being simpler, using hashclr may give the compiler a chance to optimize better. Convert instances of hashcpy with the source argument of null_sha1 to hashclr. This transformation was implemented using the following semantic patch: @@ expression E1; @@ -hashcpy(E1, null_sha1); +hashclr(E1); Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano