Merge branch 'ss/exc-flag-is-a-collection-of-bits'

Code clean-up.

* ss/exc-flag-is-a-collection-of-bits:
  dir: store EXC_FLAG_* values in unsigned integers

diff --cc attr.c
Simple merge

diff --cc dir.c
index a4a9d9fae154849fe38b153af9b16e00ef401f60,372581b0a352d412838100b05d2c4615e6ec212d..996653b0d3b6d81b15a3185d8d63314de647c53d
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -790,15 -661,9 +790,15 @@@ static void add_excludes_from_file_1(st
                die("cannot use %s as an exclude file", fname);
  }
  
 +void add_excludes_from_file(struct dir_struct *dir, const char *fname)
 +{
 +      dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
 +      add_excludes_from_file_1(dir, fname, NULL);
 +}
 +
  int match_basename(const char *basename, int basenamelen,
                   const char *pattern, int prefix, int patternlen,
-                  int flags)
+                  unsigned flags)
  {
        if (prefix == patternlen) {
                if (patternlen == basenamelen &&

diff --cc dir.h
Simple merge