Merge branch 'as/test-tweaks'

diff --git a/builtin/config.c b/builtin/config.c
index e796af4db6c533a936ecfc70d36e936a8fffa4bd..33c9bf9d84f514330f12de5cbd9dfb610a1b16de 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -137,7 +137,8 @@ static int collect_config(const char *key_, const char *value_, void *cb)
                else
                        sprintf(value, "%d", v);
        } else if (types == TYPE_PATH) {
-               git_config_pathname(&vptr, key_, value_);
+               if (git_config_pathname(&vptr, key_, value_) < 0)
+                       return -1;
                must_free_vptr = 1;
        } else if (value_) {
                vptr = value_;