diff options
author | Stefan Beller <sbeller@google.com> | 2016-05-26 14:59:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-27 10:40:45 -0700 |
commit | 37f52e93441e1da00c9c9824ed03cd074d77f43a (patch) | |
tree | 778ea059c537026a4444b06b666b0831b2a5c860 | |
parent | Sync with maint (diff) | |
download | tgif-37f52e93441e1da00c9c9824ed03cd074d77f43a.tar.xz |
submodule-config: keep shallow recommendation around
The shallow field will be used in a later patch by `submodule update`.
To differentiate between the actual depth (which may be different),
we name it `recommend_shallow` as the field in the .gitmodules file
is only a recommendation by the project.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | submodule-config.c | 9 | ||||
-rw-r--r-- | submodule-config.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/submodule-config.c b/submodule-config.c index debab294d4..db1847ff68 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -199,6 +199,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache, submodule->update_strategy.command = NULL; submodule->fetch_recurse = RECURSE_SUBMODULES_NONE; submodule->ignore = NULL; + submodule->recommend_shallow = -1; hashcpy(submodule->gitmodules_sha1, gitmodules_sha1); @@ -353,6 +354,14 @@ static int parse_config(const char *var, const char *value, void *data) else if (parse_submodule_update_strategy(value, &submodule->update_strategy) < 0) die(_("invalid value for %s"), var); + } else if (!strcmp(item.buf, "shallow")) { + if (!me->overwrite && submodule->recommend_shallow != -1) + warn_multiple_config(me->commit_sha1, submodule->name, + "shallow"); + else { + submodule->recommend_shallow = + git_config_bool(var, value); + } } strbuf_release(&name); diff --git a/submodule-config.h b/submodule-config.h index e4857f53a8..b1fdcc0c33 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -18,6 +18,7 @@ struct submodule { struct submodule_update_strategy update_strategy; /* the sha1 blob id of the responsible .gitmodules file */ unsigned char gitmodules_sha1[20]; + int recommend_shallow; }; int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); |