summaryrefslogtreecommitdiff
path: root/submodule-config.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-03-14 21:46:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-16 01:15:54 (GMT)
commitd601fd09573540287d1e00e3a25ef6311885bb46 (patch)
tree1cd1f477edaf3ce8c43be9c934a47394687d5534 /submodule-config.c
parent15cdc6477634e0227e4211de464c6443a68172c9 (diff)
downloadgit-d601fd09573540287d1e00e3a25ef6311885bb46.zip
git-d601fd09573540287d1e00e3a25ef6311885bb46.tar.gz
git-d601fd09573540287d1e00e3a25ef6311885bb46.tar.bz2
update submodules: add submodule config parsing
Similar to b33a15b08 (push: add recurseSubmodules config option, 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code that is later used to parse whether we are interested in updating submodules. We need the `die_on_error` parameter to be able to call this parsing function for the config file as well, which if incorrect lets Git die. As we're just touching the header file, also mark all functions extern. 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.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/submodule-config.c b/submodule-config.c
index 9345390..3e8e380 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -234,6 +234,26 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
return parse_fetch_recurse(opt, arg, 1);
}
+static int parse_update_recurse(const char *opt, const char *arg,
+ int die_on_error)
+{
+ switch (git_config_maybe_bool(opt, arg)) {
+ case 1:
+ return RECURSE_SUBMODULES_ON;
+ case 0:
+ return RECURSE_SUBMODULES_OFF;
+ default:
+ if (die_on_error)
+ die("bad %s argument: %s", opt, arg);
+ return RECURSE_SUBMODULES_ERROR;
+ }
+}
+
+int parse_update_recurse_submodules_arg(const char *opt, const char *arg)
+{
+ return parse_update_recurse(opt, arg, 1);
+}
+
static int parse_push_recurse(const char *opt, const char *arg,
int die_on_error)
{