diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:01 -0700 |
| commit | bdebbeb3346e9867005947aff356b99a7358e5ab (patch) | |
| tree | 36d4dc9b1776fef1794432de7dd0c3a50793a9e1 /submodule-config.h | |
| parent | 77e075124acc3f1185a8b178aac479c8278780a5 (diff) | |
| parent | 72290d6a1d8cccd22f58c21418c0f75bfcdf574d (diff) | |
| download | git-bdebbeb3346e9867005947aff356b99a7358e5ab.tar.gz git-bdebbeb3346e9867005947aff356b99a7358e5ab.tar.xz | |
Merge branch 'sb/submodule-parallel-update'
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
Diffstat (limited to 'submodule-config.h')
| -rw-r--r-- | submodule-config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule-config.h b/submodule-config.h index 9bfa65af0..e4857f53a 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -2,6 +2,7 @@ #define SUBMODULE_CONFIG_CACHE_H #include "hashmap.h" +#include "submodule.h" #include "strbuf.h" /* @@ -14,6 +15,7 @@ struct submodule { const char *url; int fetch_recurse; const char *ignore; + struct submodule_update_strategy update_strategy; /* the sha1 blob id of the responsible .gitmodules file */ unsigned char gitmodules_sha1[20]; }; |