Issue 64

CHANGES.rst

@@ -13,7 +13,7 @@ Bug fixes:
 - Type hint on *root* parameter on `pathspec.pathspec.PathSpec.match_tree_files()`.
 - Type hint on *root* parameter on `pathspec.util.iter_tree_entries()`.
 - Type hint on *root* parameter on `pathspec.util.iter_tree_files()`.
-- WIP: `Issue #64`_: IndexError with my .gitignore file when trying to build a Python package.
+- `Issue #64`_: IndexError with my .gitignore file when trying to build a Python package.
 
 Improvements:
 

pathspec/_meta.py

@@ -46,6 +46,7 @@
 	"jack1142 <https://github.com/jack1142>",
 	"mgorny <https://github.com/mgorny>",
 	"bzakdd <https://github.com/bzakdd>",
+	"haimat <https://github.com/haimat>",
 ]
 __license__ = "MPL 2.0"
 __version__ = "0.10.2.dev1"

pathspec/patterns/gitwildmatch.py

@@ -166,7 +166,7 @@ def pattern_to_regex(
 						if i == 0 and i == end:
 							# A pattern consisting solely of double-asterisks ('**')
 							# will match every path.
-							output.append('.+')
+							output.append(f'[^/]+(?:(?P<{_DIR_MARK}>/).*)?')
 						elif i == 0:
 							# A normalized pattern beginning with double-asterisks
 							# ('**') will match any leading path segments.

tests/test_gitignore.py

@@ -338,3 +338,23 @@ def test_05_issue_39(self):
 			'important/d.log',
 			'important/e.txt',
 		})
+
+	def test_06_issue_64(self):
+		"""
+		Test using a double asterisk pattern.
+		"""
+		spec = GitIgnoreSpec.from_lines([
+			"**",
+		])
+		files = {
+			'x',
+			'y.py',
+			'A/x',
+			'A/y.py',
+			'A/B/x',
+			'A/B/y.py',
+			'A/B/C/x',
+			'A/B/C/y.py',
+		}
+		ignores = set(spec.match_files(files))
+		self.assertEqual(ignores, files)

tests/test_gitwildmatch.py

@@ -20,7 +20,7 @@
 This regular expression matches the directory marker.
 """
 
-RE_SUB = f"(?:(?P<{_DIR_MARK}>/).*)?"
+RE_SUB = f"(?:{RE_DIR}.*)?"
 """
 This regular expression matches an optional sub-path.
 """
@@ -258,7 +258,29 @@ def test_03_only_double_asterisk(self):
 		"""
 		regex, include = GitWildMatchPattern.pattern_to_regex('**')
 		self.assertTrue(include)
-		self.assertEqual(regex, '^.+$')
+		self.assertEqual(regex, f'^[^/]+{RE_SUB}$')
+		pattern = GitWildMatchPattern(re.compile(regex), include)
+		results = set(filter(pattern.match_file, [
+			'x',
+			'y.py',
+			'A/x',
+			'A/y.py',
+			'A/B/x',
+			'A/B/y.py',
+			'A/B/C/x',
+			'A/B/C/y.py',
+		]))
+
+		self.assertEqual(results, {
+			'x',
+			'y.py',
+			'A/x',
+			'A/y.py',
+			'A/B/x',
+			'A/B/y.py',
+			'A/B/C/x',
+			'A/B/C/y.py',
+		})
 
 	def test_03_parent_double_asterisk(self):
 		"""
@@ -292,7 +314,7 @@ def test_03_duplicate_leading_double_asterisk_edge_case(self):
 		"""
 		regex, include = GitWildMatchPattern.pattern_to_regex('**')
 		self.assertTrue(include)
-		self.assertEqual(regex, '^.+$')
+		self.assertEqual(regex, f'^[^/]+{RE_SUB}$')
 
 		equivalent_regex, include = GitWildMatchPattern.pattern_to_regex('**/**')
 		self.assertTrue(include)