Skip to content

Strip repeated ./ prefixes before matching paths #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luxe7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Strip repeated ./ prefixes before matching paths #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8992b2a
Strip repeated current-directory prefixes before matching paths
Luxe7 Oct 28, 2026
5ef8ffd
Test repeated current-directory prefixes in path matching
Luxe7 Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pathspec/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,11 @@ def normalize_file(
# Make path relative.
norm_file = norm_file[1:]

elif norm_file.startswith('./'):
# Remove current directory prefix.
norm_file = norm_file[2:]
# Remove all leading current directory prefixes without resolving '..'.
prefix_length = 0
while norm_file.startswith('./', prefix_length):
prefix_length += 2
norm_file = norm_file[prefix_length:]

return norm_file

Expand Down
21 changes: 21 additions & 0 deletions tests/test_01_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,27 @@ def test_01_purepath(self):
second_spec = normalize_file('a.txt')
self.assertEqual(first_spec, second_spec)

def test_repeated_current_directory_prefixes(self):
for file in ('./a.txt', '././a.txt', './././a.txt', '/././a.txt'):
with self.subTest(file=file):
self.assertEqual(normalize_file(file), 'a.txt')

def test_current_directory_prefix_with_custom_separator(self):
self.assertEqual(normalize_file('.\\.\\a.txt', separators=('\\',)), 'a.txt')

def test_preserve_other_dotted_paths(self):
for file in ('.hidden', '../a.txt', '.../a.txt', 'dir/../a.txt'):
with self.subTest(file=file):
self.assertEqual(normalize_file(file), file)

def test_repeated_prefixes_with_anchored_patterns(self):
for spec_class in (pathspec.PathSpec, pathspec.GitIgnoreSpec):
with self.subTest(spec_class=spec_class):
spec = spec_class.from_lines('gitignore', ['/build/'], backend='simple')
file = '././build/output.txt'
self.assertTrue(spec.match_file(file))
self.assertEqual(list(spec.match_files([file])), [file])


class RecursionErrorDeprecationTest(TestCase):
"""
Expand Down