Sync with maint

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index ded0d836d39d101f7879fecb11e7057a006c1b17..44c421eb0fe9cd8947d6666d15d790bc241ee7f3 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -94,6 +94,8 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        struct git_attr_check *check;
        int cnt, i, doubledash, filei;
 
+       git_config(git_default_config, NULL);
+
        argc = parse_options(argc, argv, prefix, check_attr_options,
                             check_attr_usage, PARSE_OPT_KEEP_DASHDASH);