From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Dec 2010 22:30:43 +0000 (-0800)
Subject: Merge branch 'jk/maint-decorate-01-bool'
X-Git-Tag: v1.7.4-rc0~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7d07cce82ccdbc3a7cf343943d359287cb19c5a?ds=inline;hp=-c

Merge branch 'jk/maint-decorate-01-bool'

* jk/maint-decorate-01-bool:
handle arbitrary ints in git_config_maybe_bool
---

f7d07cce82ccdbc3a7cf343943d359287cb19c5a
diff --combined config.c
index 32c0b2c41e,1bf10046be..d73b090b6a
--- a/config.c
+++ b/config.c
@@@ -429,13 -429,11 +429,11 @@@ static int git_config_maybe_bool_text(c
  
  int git_config_maybe_bool(const char *name, const char *value)
  {
- 	int v = git_config_maybe_bool_text(name, value);
+ 	long v = git_config_maybe_bool_text(name, value);
  	if (0 <= v)
  		return v;
- 	if (!strcmp(value, "0"))
- 		return 0;
- 	if (!strcmp(value, "1"))
- 		return 1;
+ 	if (git_parse_long(value, &v))
+ 		return !!v;
  	return -1;
  }
  
@@@ -501,13 -499,6 +499,13 @@@ static int git_default_core_config(cons
  		return 0;
  	}
  
 +	if (!strcmp(var, "core.abbrevguard")) {
 +		unique_abbrev_extra_length = git_config_int(var, value);
 +		if (unique_abbrev_extra_length < 0)
 +			unique_abbrev_extra_length = 0;
 +		return 0;
 +	}
 +
  	if (!strcmp(var, "core.bare")) {
  		is_bare_repository_cfg = git_config_bool(var, value);
  		return 0;
@@@ -890,7 -881,9 +888,7 @@@ int git_config(config_fn_t fn, void *da
  	if (config_parameters)
  		found += 1;
  
 -	if (found == 0)
 -		return -1;
 -	return ret;
 +	return ret == 0 ? found : ret;
  }
  
  /*