diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-08 20:24:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-08 20:24:14 +0100 |
| commit | 5e826019ef48e1d324c9a1866ed65f5be8990998 (patch) | |
| tree | e826d2b4e188dfd8bd2df1013bff89ac3d60017d /config.c | |
| parent | Merge branch 'gc/http-with-non-ascii-username-url' (diff) | |
| parent | log.decorate: accept 0/1 bool values (diff) | |
| download | git-5e826019ef48e1d324c9a1866ed65f5be8990998.tar.xz git-5e826019ef48e1d324c9a1866ed65f5be8990998.zip | |
Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool:
log.decorate: accept 0/1 bool values
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -410,7 +410,7 @@ unsigned long git_config_ulong(const char *name, const char *value) return ret; } -int git_config_maybe_bool(const char *name, const char *value) +static int git_config_maybe_bool_text(const char *name, const char *value) { if (!value) return 1; @@ -427,9 +427,21 @@ int git_config_maybe_bool(const char *name, const char *value) return -1; } +int git_config_maybe_bool(const char *name, const char *value) +{ + int 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; + return -1; +} + int git_config_bool_or_int(const char *name, const char *value, int *is_bool) { - int v = git_config_maybe_bool(name, value); + int v = git_config_maybe_bool_text(name, value); if (0 <= v) { *is_bool = 1; return v; |