Merge branch 'cb/maint-orphan-merge-noclobber'

[git.git] / config.c

diff --git a/config.c b/config.c
index c2c995f16df31a3553c3260f9d32e1572b1d45eb..c63d6834e087bbe2469cb285d3b3de475b76b972 100644 (file)
--- a/config.c
+++ b/config.c
@@ -605,6 +605,9 @@ static int git_default_core_config(const char *var, const char *value)
        if (!strcmp(var, "core.editor"))
                return git_config_string(&editor_program, var, value);
 
+       if (!strcmp(var, "core.askpass"))
+               return git_config_string(&askpass_program, var, value);
+
        if (!strcmp(var, "core.excludesfile"))
                return git_config_pathname(&excludes_file, var, value);
 
@@ -868,9 +871,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;
 }
 
 /*