summaryrefslogtreecommitdiff
path: root/submodule-config.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-05-26 14:59:42 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-27 10:40:45 -0700
commit37f52e93441e1da00c9c9824ed03cd074d77f43a (patch)
tree778ea059c537026a4444b06b666b0831b2a5c860 /submodule-config.c
parent7777322816a31edff4fb9f429847d11f8974f264 (diff)
downloadgit-37f52e93441e1da00c9c9824ed03cd074d77f43a.tar.gz
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>
Diffstat (limited to 'submodule-config.c')
-rw-r--r--submodule-config.c9
1 files changed, 9 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);