Sync with maint-2.35

* maint-2.35:
  attr: adjust a mismatched data type

diff --combined attr.c
index c83f203aa82dc9d830d6f969f656f1ddced9bdb6,d5f269167bb8ad72fd2a0d95e0d4388e209a7cda..c010bd9fa3ed3fe3ff0998d34ed0d2acfddc2eef
--- 1/attr.c
--- 2/attr.c
+++ b/attr.c
@@@ -14,6 -14,7 +14,6 @@@
  #include "utf8.h"
  #include "quote.h"
  #include "thread-utils.h"
 -#include "dir.h"
  
  const char git_attr__true[] = "(builtin)true";
  const char git_attr__false[] = "\0(builtin)false";
@@@ -79,7 -80,7 +79,7 @@@ static int attr_hash_entry_cmp(const vo
   * Access to this dictionary must be surrounded with a mutex.
   */
  static struct attr_hashmap g_attr_hashmap = {
 -      HASHMAP_INIT(attr_hash_entry_cmp, NULL)
 +      .map = HASHMAP_INIT(attr_hash_entry_cmp, NULL),
  };
  
  /*
@@@ -756,7 -757,7 +756,7 @@@ static struct attr_stack *read_attr_fro
        struct attr_stack *res;
        char *buf, *sp;
        int lineno = 0;
-       size_t size;
+       unsigned long size;
  
        if (!istate)
                return NULL;