From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:37:15 +0000 (-0700)
Subject: Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint
X-Git-Tag: v2.8.2~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9fabc7083275f455ef21123cbdcbdd31b21a8251

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

Code clean-up.

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

9fabc7083275f455ef21123cbdcbdd31b21a8251
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 &&