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

Merge branch 'sb/misc-cleanups'

2016-05-10T20:40:29Z

* sb/misc-cleanups: submodule-config: don't shadow `cache` config.c: drop local variable

submodule-config: don't shadow `cache`

2016-04-28T16:56:16Z

Lots of internal functions in submodule-confic.c have a first parameter `struct submodule_cache *cache`, which currently always refers to the global variable `cache` in the file. To avoid confusion rename the global `cache` variable. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'ak/use-hashmap-iter-first-in-submodule-config'

2016-04-13T21:12:29Z

Minor code cleanup. * ak/use-hashmap-iter-first-in-submodule-config: submodule-config: use hashmap_iter_first()

Merge branch 'sb/submodule-parallel-update'

2016-04-06T18:39:01Z

A major part of "git submodule update" has been ported to C to take advantage of the recently added framework to run download tasks in parallel. * sb/submodule-parallel-update: clone: allow an explicit argument for parallel submodule clones submodule update: expose parallelism to the user submodule helper: remove double 'fatal: ' prefix git submodule update: have a dedicated helper for cloning run_processes_parallel: rename parameters for the callbacks run_processes_parallel: treat output of children as byte array submodule update: direct error message to stderr fetching submodules: respect `submodule.fetchJobs` config option submodule-config: drop check against NULL submodule-config: keep update strategy around

submodule-config: use hashmap_iter_first()

2016-03-23T20:39:13Z

The hashmap API provides hashmap_iter_first() helper for initialion and getting the first entry of a hashmap. Let's use it instead of doing initialization manually and then get the first entry. There are no functional changes, just cleanup. Signed-off-by: Alexander Kuleshov Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano

submodule-config: drop check against NULL

2016-03-01T19:57:17Z

Adhere to the common coding style of Git and not check explicitly for NULL throughout the file. There are still other occurrences in the code base but that is usually inside of conditions with side effects. Reviewed-by: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

submodule-config: keep update strategy around

2016-03-01T19:57:17Z

Currently submodule..update is only handled by git-submodule.sh. C code will start to need to make use of that value as more of the functionality of git-submodule.sh moves into library code in C. Add the update field to 'struct submodule' and populate it so it can be read as sm->update or from sm->update_command. Reviewed-by: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

config: add 'origin_type' to config_source struct

2016-02-22T17:36:33Z

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 Signed-off-by: Lars Schneider Acked-by: Jeff King Signed-off-by: Junio C Hamano

rename git_config_from_buf to git_config_from_mem

2016-02-19T18:08:12Z

This matches the naming used in the index_{fd,mem,...} functions. Suggested-by: Junio C Hamano Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano

push: add recurseSubmodules config option

2015-11-20T13:02:07Z

The --recurse-submodules command line parameter has existed for some time but it has no config file equivalent. Following the style of the corresponding parameter for git fetch, let's invent push.recurseSubmodules to provide a default for this parameter. This also requires the addition of --recurse-submodules=no to allow the configuration to be overridden on the command line when required. The most straightforward way to implement this appears to be to make push use code in submodule-config in a similar way to fetch. Signed-off-by: Mike Crowe Signed-off-by: Jeff King