Merge branch 'cn/config-missing-path' into maint

diff --git a/builtin/config.c b/builtin/config.c
index e1c33e0691796601ac869278c155194d33ee8332..505bbc7dddc2d080fcaa9acf93ed5c1379fbe75f 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -129,7 +129,8 @@ static int show_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_;