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/merge.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/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index d5797b8fe7..e15f008950 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -566,7 +566,7 @@ static int git_merge_config(const char *k, const char *v, void *cb) else if (!strcmp(k, "merge.renormalize")) option_renormalize = git_config_bool(k, v); else if (!strcmp(k, "merge.ff")) { - int boolval = git_config_maybe_bool(k, v); + int boolval = git_parse_maybe_bool(v); if (0 <= boolval) { fast_forward = boolval ? FF_ALLOW : FF_NO; } else if (v && !strcmp(v, "only")) { @@ -940,7 +940,7 @@ static int default_edit_option(void) return 0; if (e) { - int v = git_config_maybe_bool(name, e); + int v = git_parse_maybe_bool(e); if (v < 0) die(_("Bad value '%s' in environment '%s'"), e, name); return v; |