mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 19:16:14 +02:00
Code

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

* jk/maint-decorate-01-bool:
  handle arbitrary ints in git_config_maybe_bool
This commit is contained in:
Junio C Hamano 2010-12-21 14:30:43 -08:00
parent 876e78f31d db6195efab
commit f7d07cce82
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.c
View File

@ -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 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;
}