From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2020 20:20:36 +0000 (-0700)
Subject: Merge branch 'en/fill-directory-exponential' into master
X-Git-Tag: v2.29.0-rc0~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82fafc77bac9b3294b3e67bc021eeb511137c0f7;p=thirdparty%2Fgit.git

Merge branch 'en/fill-directory-exponential' into master

Fix to a regression introduced during 2.27 cycle.

* en/fill-directory-exponential:
  dir: check pathspecs before returning `path_excluded`
---

82fafc77bac9b3294b3e67bc021eeb511137c0f7
diff --cc dir.c
index 1045cc9c6f,bcd04b7cbf..fe64be30ed
--- a/dir.c
+++ b/dir.c
@@@ -2209,13 -2117,13 +2209,13 @@@ static enum path_treatment treat_path(s
  				       baselen, excluded, pathspec);
  	case DT_REG:
  	case DT_LNK:
- 		if (excluded)
- 			return path_excluded;
  		if (pathspec &&
 -		    !do_match_pathspec(istate, pathspec, path->buf, path->len,
 -				       0 /* prefix */, NULL /* seen */,
 -				       0 /* flags */))
 +		    !match_pathspec(istate, pathspec, path->buf, path->len,
 +				    0 /* prefix */, NULL /* seen */,
 +				    0 /* is_dir */))
  			return path_none;
+ 		if (excluded)
+ 			return path_excluded;
  		return path_untracked;
  	}
  }