From a2efa0e5113b0efc96cac9618dd8d438310b417f Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 9 Jul 2025 19:52:07 +0200 Subject: go-git-gitignore: simpleNameMatch: bail out on "p.dirOnly && !isDir" Fixes this test failure: --- FAIL: TestIssue927Minimal (0.03s) exclude_test.go:44: File "dir/zzz" is visible, but should be hidden FAIL testcases[0] = struct { plaintextnames bool; deterministic_names bool }{plaintextnames:true, deterministic_names:false} failed exit status 1 FAIL github.com/rfjakob/gocryptfs/v2/tests/reverse 0.577s --- internal/go-git-gitignore/pattern_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/go-git-gitignore/pattern_test.go') diff --git a/internal/go-git-gitignore/pattern_test.go b/internal/go-git-gitignore/pattern_test.go index 17aa16a..a6f4eb1 100644 --- a/internal/go-git-gitignore/pattern_test.go +++ b/internal/go-git-gitignore/pattern_test.go @@ -41,7 +41,7 @@ func (s *PatternSuite) TestMatch_domainMismatch_mismatch() { func (s *PatternSuite) TestSimpleMatch_withDomain() { p := ParsePattern("middle/", []string{"value", "volcano"}) r := p.Match([]string{"value", "volcano", "middle", "tail"}, false) - s.Equal(Exclude, r) + s.Equal(NoMatch, r) } func (s *PatternSuite) TestSimpleMatch_onlyMatchInDomain_mismatch() { @@ -71,13 +71,13 @@ func (s *PatternSuite) TestSimpleMatch_atEnd() { func (s *PatternSuite) TestSimpleMatch_atStart_dirWanted() { p := ParsePattern("value/", nil) r := p.Match([]string{"value", "tail"}, false) - s.Equal(Exclude, r) + s.Equal(NoMatch, r) } func (s *PatternSuite) TestSimpleMatch_inTheMiddle_dirWanted() { p := ParsePattern("value/", nil) r := p.Match([]string{"head", "value", "tail"}, false) - s.Equal(Exclude, r) + s.Equal(NoMatch, r) } func (s *PatternSuite) TestSimpleMatch_atEnd_dirWanted() { -- cgit v1.2.3