summary refs log tree commit diff
path: root/pager.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-22 10:29:03 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-22 10:29:03 -0700
commitbdfcdefd2f0587873436c950dd7a0798d313eb34 (patch)
treea87f56e7da3e2b6bbc93dd6e64a86a4a4801a372 /pager.c
parent6cb3822cfb34487b2e630f8fe0542c4e0dd8b2f2 (diff)
parentf094b89a4d75216736830b5d2286ebc6846a25a9 (diff)
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 'pager.c')
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index 4dd9e1b265..92b23e6cd1 100644
--- a/pager.c
+++ b/pager.c
@@ -194,7 +194,7 @@ static int pager_command_config(const char *var, const char *value, void *vdata)
 	const char *cmd;
 
 	if (skip_prefix(var, "pager.", &cmd) && !strcmp(cmd, data->cmd)) {
-		int b = git_config_maybe_bool(var, value);
+		int b = git_parse_maybe_bool(value);
 		if (b >= 0)
 			data->want = b;
 		else {