From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Apr 2016 18:38:59 +0000 (-0700)
Subject: Merge branch 'ss/exc-flag-is-a-collection-of-bits'
X-Git-Tag: v2.9.0-rc0~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12508a83549e59f0160ada423997069bf4a4003f;p=thirdparty%2Fgit.git

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
---

12508a83549e59f0160ada423997069bf4a4003f
diff --cc dir.c
index a4a9d9fae1,372581b0a3..996653b0d3
--- a/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 &&