Sync with Git 2.37.5

diff --cc attr.c
index 42ad6de8c7c61432e4a3c950d940eee433680a74,c83f203aa82dc9d830d6f969f656f1ddced9bdb6..b43e93ee96573780737bb55a4da23c2e8d0582c7
--- 1/attr.c
--- 2/attr.c
+++ b/attr.c
@@@ -23,8 -23,12 +23,8 @@@ static const char git_attr__unknown[] 
  #define ATTR__UNSET NULL
  #define ATTR__UNKNOWN git_attr__unknown
  
 -#ifndef DEBUG_ATTR
 -#define DEBUG_ATTR 0
 -#endif
 -
  struct git_attr {
-       int attr_nr; /* unique attribute number */
+       unsigned int attr_nr; /* unique attribute number */
        char name[FLEX_ARRAY]; /* attribute name */
  };
  
@@@ -996,17 -1049,20 +1017,17 @@@ static int path_matches(const char *pat
  
  static int macroexpand_one(struct all_attrs_item *all_attrs, int nr, int rem);
  
 -static int fill_one(const char *what, struct all_attrs_item *all_attrs,
 +static int fill_one(struct all_attrs_item *all_attrs,
                    const struct match_attr *a, int rem)
  {
-       int i;
+       size_t i;
  
-       for (i = a->num_attr - 1; rem > 0 && i >= 0; i--) {
-               const struct git_attr *attr = a->state[i].attr;
+       for (i = a->num_attr; rem > 0 && i > 0; i--) {
+               const struct git_attr *attr = a->state[i - 1].attr;
                const char **n = &(all_attrs[attr->attr_nr].value);
-               const char *v = a->state[i].setto;
+               const char *v = a->state[i - 1].setto;
  
                if (*n == ATTR__UNKNOWN) {
 -                      debug_set(what,
 -                                a->is_macro ? a->u.attr->name : a->u.pat.pattern,
 -                                attr, v);
                        *n = v;
                        rem--;
                        rem = macroexpand_one(all_attrs, attr->attr_nr, rem);

diff --cc git-compat-util.h
Simple merge

diff --cc pretty.c
Simple merge

diff --cc t/t0003-attributes.sh
Simple merge

diff --cc t/t1450-fsck.sh
Simple merge