summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-12-10 20:00:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-11 20:23:23 (GMT)
commit072a231016e5da347c3a8ff38afb72e7876dd1d7 (patch)
treef3c01dc53048c3c563acdc08b2b86ab76c3736ea /dir.c
parent2f5d3847d4ed1b6d6c6d2a2e6726cfcda7d361e5 (diff)
downloadgit-072a231016e5da347c3a8ff38afb72e7876dd1d7.zip
git-072a231016e5da347c3a8ff38afb72e7876dd1d7.tar.gz
git-072a231016e5da347c3a8ff38afb72e7876dd1d7.tar.bz2
dir: exit before wildcard fall-through if there is no wildcard
The DO_MATCH_LEADING_PATHSPEC had a fall-through case for if there was a wildcard, noting that we don't yet have enough information to determine if a further paths under the current directory might match due to the presence of wildcards. But if we have no wildcards in our pathspec, then we shouldn't get to that fall-through case. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/dir.c b/dir.c
index 5dacacd..517a569 100644
--- a/dir.c
+++ b/dir.c
@@ -380,6 +380,13 @@ static int match_pathspec_item(const struct index_state *istate,
return 0;
/*
+ * name has no wildcard, and it didn't match as a leading
+ * pathspec so return.
+ */
+ if (item->nowildcard_len == item->len)
+ return 0;
+
+ /*
* Here is where we would perform a wildmatch to check if
* "name" can be matched as a directory (or a prefix) against
* the pathspec. Since wildmatch doesn't have this capability