@matheusbsbs / matheus-bagliano / commits / 9be04d64c9

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>

Martin Ågren committed Aug 7, 2017 at 20:20 UTC 9be04d64c9b45a37cba161ba2eff2e784f87f91a

1 file changed +8 -3

config.c

+8 -3

@@ -709,7 +709,7 @@ unsigned long git_config_ulong(const char *name, const char *value)

709 return ret;

710 }

711

712 -int git_parse_maybe_bool(const char *value)

712 +static int git_parse_maybe_bool_text(const char *value)

713 {

714 if (!value)

715 return 1;

@@ -726,9 +726,14 @@ int git_parse_maybe_bool(const char *value)

726 return -1;

727 }

728

729 +int git_parse_maybe_bool(const char *value)

730 +{

731 + return git_parse_maybe_bool_text(value);

732 +}

733 +

734 int git_config_maybe_bool(const char *name, const char *value)

735 {

731 - int v = git_parse_maybe_bool(value);

736 + int v = git_parse_maybe_bool_text(value);

737 if (0 <= v)

738 return v;

739 if (git_parse_int(value, &v))

@@ -738,7 +743,7 @@ int git_config_maybe_bool(const char *name, const char *value)

743

744 int git_config_bool_or_int(const char *name, const char *value, int *is_bool)

745 {

741 - int v = git_parse_maybe_bool(value);

746 + int v = git_parse_maybe_bool_text(value);

747 if (0 <= v) {

748 *is_bool = 1;

749 return v;