summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-07 18:20:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-07 20:29:22 (GMT)
commit8957661378b073b49875059d6426614facb0d7f0 (patch)
treed0ab9bbeb05fc9687b9823876bc1322fd2b35453 /builtin/remote.c
parent4666741823239ed45ce9a63914dfd3c1601cf868 (diff)
downloadgit-8957661378b073b49875059d6426614facb0d7f0.zip
git-8957661378b073b49875059d6426614facb0d7f0.tar.gz
git-8957661378b073b49875059d6426614facb0d7f0.tar.bz2
treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool
The only difference between these is that the former takes an argument `name` which it ignores completely. Still, the callers are quite careful to provide reasonable values for it. Once in-flight topics have landed, we should be able to remove git_config_maybe_bool. In the meantime, document it as deprecated in the technical documentation. While at it, document git_parse_maybe_bool. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/remote.c')
-rw-r--r--builtin/remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 5339ed6..ecd7b3a 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -300,7 +300,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
}
string_list_append(&info->merge, xstrdup(value));
} else {
- int v = git_config_maybe_bool(orig_key, value);
+ int v = git_parse_maybe_bool(value);
if (v >= 0)
info->rebase = v;
else if (!strcmp(value, "preserve"))