From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 17:29:03 +0000 (-0700)
Subject: Merge branch 'ma/parse-maybe-bool'
X-Git-Tag: v2.15.0-rc0~176
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdfcdefd2f0587873436c950dd7a0798d313eb34;p=thirdparty%2Fgit.git

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=
---

bdfcdefd2f0587873436c950dd7a0798d313eb34
diff --cc builtin/log.c
index 725c7b8a1a,8a46cec399..25c8241092
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -53,14 -52,9 +53,14 @@@ struct line_opt_callback_data 
  	struct string_list args;
  };
  
 +static int auto_decoration_style(void)
 +{
 +	return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
 +}
 +
- static int parse_decoration_style(const char *var, const char *value)
+ static int parse_decoration_style(const char *value)
  {
- 	switch (git_config_maybe_bool(var, value)) {
+ 	switch (git_parse_maybe_bool(value)) {
  	case 1:
  		return DECORATE_SHORT_REFS;
  	case 0:
diff --cc config.c
index c1450732d9,434a7daf19..777527daef
--- a/config.c
+++ b/config.c
@@@ -921,15 -709,7 +921,15 @@@ unsigned long git_config_ulong(const ch
  	return ret;
  }
  
 +ssize_t git_config_ssize_t(const char *name, const char *value)
 +{
 +	ssize_t ret;
 +	if (!git_parse_ssize_t(value, &ret))
 +		die_bad_number(name, value);
 +	return ret;
 +}
 +
- int git_parse_maybe_bool(const char *value)
+ static int git_parse_maybe_bool_text(const char *value)
  {
  	if (!value)
  		return 1;
diff --cc submodule-config.c
index 2b83c2319f,0fcdb39267..0c839019e1
--- a/submodule-config.c
+++ b/submodule-config.c
@@@ -267,47 -234,6 +267,47 @@@ int parse_fetch_recurse_submodules_arg(
  	return parse_fetch_recurse(opt, arg, 1);
  }
  
 +int option_fetch_parse_recurse_submodules(const struct option *opt,
 +					  const char *arg, int unset)
 +{
 +	int *v;
 +
 +	if (!opt->value)
 +		return -1;
 +
 +	v = opt->value;
 +
 +	if (unset) {
 +		*v = RECURSE_SUBMODULES_OFF;
 +	} else {
 +		if (arg)
 +			*v = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
 +		else
 +			*v = RECURSE_SUBMODULES_ON;
 +	}
 +	return 0;
 +}
 +
 +static int parse_update_recurse(const char *opt, const char *arg,
 +				int die_on_error)
 +{
- 	switch (git_config_maybe_bool(opt, arg)) {
++	switch (git_parse_maybe_bool(arg)) {
 +	case 1:
 +		return RECURSE_SUBMODULES_ON;
 +	case 0:
 +		return RECURSE_SUBMODULES_OFF;
 +	default:
 +		if (die_on_error)
 +			die("bad %s argument: %s", opt, arg);
 +		return RECURSE_SUBMODULES_ERROR;
 +	}
 +}
 +
 +int parse_update_recurse_submodules_arg(const char *opt, const char *arg)
 +{
 +	return parse_update_recurse(opt, arg, 1);
 +}
 +
  static int parse_push_recurse(const char *opt, const char *arg,
  			       int die_on_error)
  {