Merge branch 'jc/diff-numstat'

diff --git a/builtin-repo-config.c b/builtin-repo-config.c
index 9cf12d32e5bc0be8034b16551336afee1e7d3a00..f60cee1dc54497d8ba00069a56e14b431f6a0852 100644 (file)
--- a/builtin-repo-config.c
+++ b/builtin-repo-config.c
@@ -119,7 +119,7 @@ static int get_value(const char* key_, const char* regex_)
        if (do_all)
                ret = !seen;
        else
-               ret =  (seen == 1) ? 0 : 1;
+               ret = (seen == 1) ? 0 : seen > 1 ? 2 : 1;
 
 free_strings:
        free(repo_config);