Merge branch 'jc/abbrev-guard'

diff --git a/config.c b/config.c
index 1aa72c2c41719327b62805a38703a124da6d30be..f138c34721b4751f3e8b0a1d10680f70ebfa2741 100644 (file)
--- a/config.c
+++ b/config.c
@@ -878,9 +878,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;
 }
 
 /*