diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 17:29:03 (GMT) |
| commit | bdfcdefd2f0587873436c950dd7a0798d313eb34 (patch) | |
| tree | a87f56e7da3e2b6bbc93dd6e64a86a4a4801a372 /builtin/pull.c | |
| parent | 6cb3822cfb34487b2e630f8fe0542c4e0dd8b2f2 (diff) | |
| parent | f094b89a4d75216736830b5d2286ebc6846a25a9 (diff) | |
| download | git-bdfcdefd2f0587873436c950dd7a0798d313eb34.zip git-bdfcdefd2f0587873436c950dd7a0798d313eb34.tar.gz git-bdfcdefd2f0587873436c950dd7a0798d313eb34.tar.bz2 | |
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/pull.c')
| -rw-r--r-- | builtin/pull.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 9b86e51..7fe2814 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -39,7 +39,7 @@ enum rebase_type { static enum rebase_type parse_config_rebase(const char *key, const char *value, int fatal) { - int v = git_config_maybe_bool("pull.rebase", value); + int v = git_parse_maybe_bool(value); if (!v) return REBASE_FALSE; @@ -274,7 +274,7 @@ static const char *config_get_ff(void) if (git_config_get_value("pull.ff", &value)) return NULL; - switch (git_config_maybe_bool("pull.ff", value)) { + switch (git_parse_maybe_bool(value)) { case 0: return "--no-ff"; case 1: |