Merge branch 'ks/blame-worktree-textconv-cached'

diff --git a/config.c b/config.c
index 9918b9351d8b8b9b33fea479bd4f4997a5d6528a..d73b090b6a60d05b18309755dee4ce3b6e055b2d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -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;
 }
 
@@ -501,6 +499,13 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.abbrevguard")) {
+               unique_abbrev_extra_length = git_config_int(var, value);
+               if (unique_abbrev_extra_length < 0)
+                       unique_abbrev_extra_length = 0;
+               return 0;
+       }
+
        if (!strcmp(var, "core.bare")) {
                is_bare_repository_cfg = git_config_bool(var, value);
                return 0;
@@ -883,9 +888,7 @@ int git_config(config_fn_t fn, void *data)
        if (config_parameters)
                found += 1;
 
-       if (found == 0)
-               return -1;
-       return ret;
+       return ret == 0 ? found : ret;
 }
 
 /*