pack-objects: merge read_lock and lock in packing_data struct

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 91444dc0448b32e854f1923fe1e57e28c87f5b35..30a2f84274d32977769f778d5704accb599cf0e7 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -63,10 +63,9 @@ static void check_attr(const char *prefix,
                prefix_path(prefix, prefix ? strlen(prefix) : 0, file);
 
        if (collect_all) {
-               git_all_attrs(full_path, check);
+               git_all_attrs(&the_index, full_path, check);
        } else {
-               if (git_check_attr(full_path, check))
-                       die("git_check_attr died");
+               git_check_attr(&the_index, full_path, check);
        }
        output_attr(check, file);
 
@@ -120,7 +119,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        }
 
        if (cached_attrs)
-               git_attr_set_direction(GIT_ATTR_INDEX, NULL);
+               git_attr_set_direction(GIT_ATTR_INDEX);
 
        doubledash = -1;
        for (i = 0; doubledash < 0 && i < argc; i++) {