[PATCH 7/8] submodule config: Keep update strategy around
- From
Stefan Beller <sbeller@google.com>
- Date
- Oct 20, 2015, 22:43 UTC
- Message-ID
- <1445381030-23912-8-git-send-email-sbeller@google.com>
- In-Reply-To
- <1445381030-23912-1-git-send-email-sbeller@google.com>
We need the submodule update strategies in a later patch.
Signed-off-by: Stefan Beller <sbeller@google.com> ---
This may conflict with origin/sb/submodule-config-parse, but only on a syntactical level (this adds an else if {...} just after the refactoredd code). There is no clash of functionality or semantics.
submodule-config.c | 11 +++++++++++ submodule-config.h | 1 + 2 files changed, 12 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c index 393de53..175bcbb 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -194,6 +194,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache, submodule->path = NULL; submodule->url = NULL; + submodule->update = NULL; submodule->fetch_recurse = RECURSE_SUBMODULES_NONE; submodule->ignore = NULL; @@ -326,6 +327,16 @@ static int parse_config(const char *var, const char *value, void *data) free((void *) submodule->url); strbuf_addstr(&url, value); submodule->url = strbuf_detach(&url, NULL); + } else if (!strcmp(item.buf, "update")) { + if (!value) + ret = config_error_nonbool(var); + else if (!me->overwrite && submodule->update != NULL) + warn_multiple_config(me->commit_sha1, submodule->name, + "update"); + else { + free((void *)submodule->update); + submodule->update = xstrdup(value); + } } release_return: diff --git a/submodule-config.h b/submodule-config.h index 9061e4e..f9e2a29 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -14,6 +14,7 @@ struct submodule { const char *url; int fetch_recurse; const char *ignore; + const char *update; /* the sha1 blob id of the responsible .gitmodules file */ unsigned char gitmodules_sha1[20]; };
-- 2.5.0.275.gbfc1651.dirty