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 /builtin/remote.c | |
| parent | 6cb3822cfb34487b2e630f8fe0542c4e0dd8b2f2 (diff) | |
| parent | f094b89a4d75216736830b5d2286ebc6846a25a9 (diff) | |
| download | git-bdfcdefd2f0587873436c950dd7a0798d313eb34.tar.gz | |
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 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 6273c0c23c..a995ea86c1 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -301,7 +301,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")) |