treewide: deprecate git_config_maybe_bool, use git_parse_maybe_bool

The only difference between these is that the former takes an argument
`name` which it ignores completely. Still, the callers are quite careful
to provide reasonable values for it.

Once in-flight topics have landed, we should be able to remove
git_config_maybe_bool. In the meantime, document it as deprecated in the
technical documentation. While at it, document git_parse_maybe_bool.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index 20741f345e459f41d357039496f7d6be30edab06..7a83a3a6e2c8fde8754fa9be4e1b218beca6bc89 100644 (file)
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -187,6 +187,10 @@ Same as `git_config_bool`, except that integers are returned as-is, and
 an `is_bool` flag is unset.
 
 `git_config_maybe_bool`::
+Deprecated. Use `git_parse_maybe_bool` instead. They are exactly the
+same, except this function takes an unused argument `name`.
+
+`git_parse_maybe_bool`::
 Same as `git_config_bool`, except that it returns -1 on error rather
 than dying.
 

diff --git a/builtin/log.c b/builtin/log.c
index 55d20cc2d88ab03d96f0476b222be3b2f6832ed9..c9564da84f4d1140f880eef50984bebe9c9d05ec 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -54,7 +54,7 @@ struct line_opt_callback_data {
 
 static int parse_decoration_style(const char *var, const char *value)
 {
-       switch (git_config_maybe_bool(var, value)) {
+       switch (git_parse_maybe_bool(value)) {
        case 1:
                return DECORATE_SHORT_REFS;
        case 0:
@@ -809,7 +809,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
                return 0;
        }
        if (!strcmp(var, "format.from")) {
-               int b = git_config_maybe_bool(var, value);
+               int b = git_parse_maybe_bool(value);
                free(from);
                if (b < 0)
                        from = xstrdup(value);

diff --git a/builtin/merge.c b/builtin/merge.c
index a96d4fb501bf1441b52a313313b8c04f3187e4d9..f9fe5c9d78ae0758a7c005e99f3e5c63309c4715 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -566,7 +566,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
        else if (!strcmp(k, "merge.renormalize"))
                option_renormalize = git_config_bool(k, v);
        else if (!strcmp(k, "merge.ff")) {
-               int boolval = git_config_maybe_bool(k, v);
+               int boolval = git_parse_maybe_bool(v);
                if (0 <= boolval) {
                        fast_forward = boolval ? FF_ALLOW : FF_NO;
                } else if (v && !strcmp(v, "only")) {
@@ -959,7 +959,7 @@ static int default_edit_option(void)
                return 0;
 
        if (e) {
-               int v = git_config_maybe_bool(name, e);
+               int v = git_parse_maybe_bool(e);
                if (v < 0)
                        die(_("Bad value '%s' in environment '%s'"), e, name);
                return v;

diff --git a/builtin/pull.c b/builtin/pull.c
index 3ecb881b0bcacbf1a453bf9a6cb95ae00cdecb1d..1c0eb27c3769019968131d2ff7aa1fff6906bde6 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -36,7 +36,7 @@ enum rebase_type {
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
                int fatal)
 {
-       int v = git_config_maybe_bool("pull.rebase", value);
+       int v = git_parse_maybe_bool(value);
 
        if (!v)
                return REBASE_FALSE;
@@ -271,7 +271,7 @@ static const char *config_get_ff(void)
        if (git_config_get_value("pull.ff", &value))
                return NULL;
 
-       switch (git_config_maybe_bool("pull.ff", value)) {
+       switch (git_parse_maybe_bool(value)) {
        case 0:
                return "--no-ff";
        case 1:

diff --git a/builtin/push.c b/builtin/push.c
index 5c22e9f2e56b7d8049890e44f4c6fb63b16f8357..1410b66d0e1ed15f3bac8d7a41ccc1bf1f9840ac 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -480,7 +480,7 @@ static int git_push_config(const char *k, const char *v, void *cb)
        } else if (!strcmp(k, "push.gpgsign")) {
                const char *value;
                if (!git_config_get_value("push.gpgsign", &value)) {
-                       switch (git_config_maybe_bool("push.gpgsign", value)) {
+                       switch (git_parse_maybe_bool(value)) {
                        case 0:
                                set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
                                break;

diff --git a/builtin/remote.c b/builtin/remote.c
index 5339ed6ad17bb0c83e05d3e60d654c4f0632ee50..ecd7b3a8cc554197330a0bba556e806c8e9a2ed6 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -300,7 +300,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                        }
                        string_list_append(&info->merge, xstrdup(value));
                } else {
-                       int v = git_config_maybe_bool(orig_key, value);
+                       int v = git_parse_maybe_bool(value);
                        if (v >= 0)
                                info->rebase = v;
                        else if (!strcmp(value, "preserve"))

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 1ff5a6753803f8c2ccb5e66dcb926582bd25fd37..a3d68d60ab77e9248d5289c9158fa110ab0eb547 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -104,7 +104,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
        if (!strcmp(k, "push.gpgsign")) {
                const char *value;
                if (!git_config_get_value("push.gpgsign", &value)) {
-                       switch (git_config_maybe_bool("push.gpgsign", value)) {
+                       switch (git_parse_maybe_bool(value)) {
                        case 0:
                                args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
                                break;

diff --git a/config.c b/config.c
index 25d798f4cffe6e74884641c35135d0652c85b110..434a7daf193a603e4b4cc9a86ee3038b8649fbd3 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1617,7 +1617,7 @@ int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *de
 {
        const char *value;
        if (!git_configset_get_value(cs, key, &value)) {
-               *dest = git_config_maybe_bool(key, value);
+               *dest = git_parse_maybe_bool(value);
                if (*dest == -1)
                        return -1;
                return 0;

diff --git a/pager.c b/pager.c
index ae79643363091f4967097bdff6e009ea4c7df5e0..40347d4e22e4da8c13c5d53b2fc58149e1a3e380 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -226,7 +226,7 @@ static int pager_command_config(const char *var, const char *value, void *vdata)
        const char *cmd;
 
        if (skip_prefix(var, "pager.", &cmd) && !strcmp(cmd, data->cmd)) {
-               int b = git_config_maybe_bool(var, value);
+               int b = git_parse_maybe_bool(value);
                if (b >= 0)
                        data->want = b;
                else {

diff --git a/submodule-config.c b/submodule-config.c
index 93453909cf3225e2b4b9630d4013f76987ca8be8..0fcdb392679162ec2a4d59033401a46dc55a35df 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -213,7 +213,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
 static int parse_fetch_recurse(const char *opt, const char *arg,
                               int die_on_error)
 {
-       switch (git_config_maybe_bool(opt, arg)) {
+       switch (git_parse_maybe_bool(arg)) {
        case 1:
                return RECURSE_SUBMODULES_ON;
        case 0:
@@ -237,7 +237,7 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
 static int parse_push_recurse(const char *opt, const char *arg,
                               int die_on_error)
 {
-       switch (git_config_maybe_bool(opt, arg)) {
+       switch (git_parse_maybe_bool(arg)) {
        case 1:
                /* There's no simple "on" value when pushing */
                if (die_on_error)