kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: introduce git_parse_maybe_bool_text 

Commit 9a549d43 ("config.c: rename git_config_maybe_bool_text and export
it as git_parse_maybe_bool", 2015-08-19) intended git_parse_maybe_bool
to be a replacement for git_config_maybe_bool, which could then be
retired. That is not obvious from the commit message, but that is what
the background on the mailing list suggests [1].

However, git_{config,parse}_maybe_bool do not handle all input the same.
Before the rename, that was by design and there is a caller in config.c
which requires git_parse_maybe_bool to behave exactly as it does.

Prepare for the next patch by renaming git_parse_maybe_bool to ..._text
and reimplementing the first one as a simple call to the second one. Let
the existing users in config.c use ..._text, since it does what they
need.

[1] https://public-inbox.org/git/xmqq7fotd71o.fsf@gitster.dls.corp.google.com/

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Martin Ågren 2017-08-07 20:20:47 +02:00 committed by Junio C Hamano
parent c4b71a7782
commit 9be04d64c9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.c
View File

@ -709,7 +709,7 @@ unsigned long git_config_ulong(const char *name, const char *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;
@ -726,9 +726,14 @@ int git_parse_maybe_bool(const char *value)
return -1;
}

int git_parse_maybe_bool(const char *value)
{
return git_parse_maybe_bool_text(value);
}

int git_config_maybe_bool(const char *name, const char *value)
{
int v = git_parse_maybe_bool(value);
int v = git_parse_maybe_bool_text(value);
if (0 <= v)
return v;
if (git_parse_int(value, &v))
@ -738,7 +743,7 @@ int git_config_maybe_bool(const char *name, const char *value)

int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
{
int v = git_parse_maybe_bool(value);
int v = git_parse_maybe_bool_text(value);
if (0 <= v) {
*is_bool = 1;
return v;