Merge branch 'ss/exc-flag-is-a-collection-of-bits'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:38:59 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:38:59 +0000 (11:38 -0700)
Code clean-up.

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

1  2 
attr.c
dir.c
dir.h

diff --cc attr.c
Simple merge
diff --cc dir.c
--- 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