diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-30 13:20:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 13:20:36 -0700 |
commit | 82fafc77bac9b3294b3e67bc021eeb511137c0f7 (patch) | |
tree | 37ba8bd8b3b0486ded2c34584cc8ddc410ff2f0b /dir.c | |
parent | Merge branch 'ct/mv-unmerged-path-error' into master (diff) | |
parent | dir: check pathspecs before returning `path_excluded` (diff) | |
download | tgif-82fafc77bac9b3294b3e67bc021eeb511137c0f7.tar.xz |
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`
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2209,13 +2209,13 @@ static enum path_treatment treat_path(struct dir_struct *dir, baselen, excluded, pathspec); case DT_REG: case DT_LNK: - if (excluded) - return path_excluded; if (pathspec && !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; } } |