Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool: handle arbitrary ints in git_config_maybe_boolmaint
commit
f7d07cce82
8
config.c
8
config.c
|
@ -429,13 +429,11 @@ static int git_config_maybe_bool_text(const char *name, const char *value)
|
||||||
|
|
||||||
int git_config_maybe_bool(const char *name, const char *value)
|
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)
|
if (0 <= v)
|
||||||
return v;
|
return v;
|
||||||
if (!strcmp(value, "0"))
|
if (git_parse_long(value, &v))
|
||||||
return 0;
|
return !!v;
|
||||||
if (!strcmp(value, "1"))
|
|
||||||
return 1;
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue