cmd_fetch_pack(): return early if finish_connect() fails

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 708988a0e1a318fb737624f489d01e0686cd0611..e1ff575daac8e1c12706c9555efcea0238cb7e64 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -5,20 +5,22 @@
 #include "parse-options.h"
 
 static int all_attrs;
+static int cached_attrs;
 static int stdin_paths;
 static const char * const check_attr_usage[] = {
-"git check-attr [-a | --all | attr...] [--] pathname...",
-"git check-attr --stdin [-a | --all | attr...] < <list-of-paths>",
+N_("git check-attr [-a | --all | attr...] [--] pathname..."),
+N_("git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"),
 NULL
 };
 
 static int null_term_line;
 
 static const struct option check_attr_options[] = {
-       OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
-       OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
+       OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")),
+       OPT_BOOLEAN(0,  "cached", &cached_attrs, N_("use .gitattributes only from the index")),
+       OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
        OPT_BOOLEAN('z', NULL, &null_term_line,
-               "input paths are terminated by a null character"),
+               N_("input paths are terminated by a null character")),
        OPT_END()
 };
 
@@ -92,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);
 
@@ -99,6 +103,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
                die("invalid cache");
        }
 
+       if (cached_attrs)
+               git_attr_set_direction(GIT_ATTR_INDEX, NULL);
+
        doubledash = -1;
        for (i = 0; doubledash < 0 && i < argc; i++) {
                if (!strcmp(argv[i], "--"))