diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:03 -0700 |
| commit | bdfcdefd2f0587873436c950dd7a0798d313eb34 (patch) | |
| tree | a87f56e7da3e2b6bbc93dd6e64a86a4a4801a372 /submodule-config.c | |
| parent | 6cb3822cfb34487b2e630f8fe0542c4e0dd8b2f2 (diff) | |
| parent | f094b89a4d75216736830b5d2286ebc6846a25a9 (diff) | |
| download | git-bdfcdefd2f0587873436c950dd7a0798d313eb34.tar.gz git-bdfcdefd2f0587873436c950dd7a0798d313eb34.tar.xz | |
Merge branch 'ma/parse-maybe-bool'
Code clean-up.
* ma/parse-maybe-bool:
parse_decoration_style: drop unused argument `var`
treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool
config: make git_{config,parse}_maybe_bool equivalent
config: introduce git_parse_maybe_bool_text
t5334: document that git push --signed=1 does not work
Doc/git-{push,send-pack}: correct --sign= to --signed=
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule-config.c b/submodule-config.c index 2b83c2319..0c839019e 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -238,7 +238,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache, static int parse_fetch_recurse(const char *opt, const char *arg, int die_on_error) { - switch (git_config_maybe_bool(opt, arg)) { + switch (git_parse_maybe_bool(arg)) { case 1: return RECURSE_SUBMODULES_ON; case 0: @@ -291,7 +291,7 @@ int option_fetch_parse_recurse_submodules(const struct option *opt, static int parse_update_recurse(const char *opt, const char *arg, int die_on_error) { - switch (git_config_maybe_bool(opt, arg)) { + switch (git_parse_maybe_bool(arg)) { case 1: return RECURSE_SUBMODULES_ON; case 0: @@ -311,7 +311,7 @@ int parse_update_recurse_submodules_arg(const char *opt, const char *arg) static int parse_push_recurse(const char *opt, const char *arg, int die_on_error) { - switch (git_config_maybe_bool(opt, arg)) { + switch (git_parse_maybe_bool(arg)) { case 1: /* There's no simple "on" value when pushing */ if (die_on_error) |