dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-06-30 19:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

dir.c: literal match with wildcard in pathspec should still glob

Browse Source 
When a path with wildcard characters, e.g. 'f*o', exists in the
working tree, "git add -- 'f*o'" stops after happily finding
that there is 'f*o' and adding it to the index, without
realizing there may be other paths, e.g. 'foooo', that may match
the given pathspec.

This is because dir.c:do_match_pathspec() disables further
matches with pathspec when it finds an exact match.

Reported-by: piotrsiupa <piotrsiupa@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
K Jayatheerth
2025-05-03 11:37:36 +05:30
committed by Junio C Hamano
parent d50a5e8939
commit ec727e189c
3 changed files with 432 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dir.c
View File

@@ -519,7 +519,8 @@ static int do_match_pathspec(struct index_state *istate,
( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE)))
continue;
if (seen && seen[i] == MATCHED_EXACTLY)
if (seen && seen[i] == MATCHED_EXACTLY &&
ps->items[i].nowildcard_len == ps->items[i].len)
continue;
/*
* Make exclude patterns optional and never report