fix failing tests

Author: nasdf

.gitignore

@@ -14,9 +14,6 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 bin
-multi.json
-multi.ignore
 coverage.txt
-.multi
-.multiverse
-.DS_Store
+.multi/
+.DS_Store

go.mod

@@ -3,7 +3,6 @@ module github.com/multiverse-vcs/go-multiverse
 go 1.16
 
 require (
-	github.com/bmatcuk/doublestar/v3 v3.0.0
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
 	github.com/ipfs/go-bitswap v0.3.2
 	github.com/ipfs/go-blockservice v0.1.4

go.sum

@@ -15,8 +15,6 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
-github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI=
-github.com/bmatcuk/doublestar/v3 v3.0.0/go.mod h1:6PcTVMw80pCY1RVuoqu3V++99uQB3vsSYKPTd8AWA0k=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
 github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=

internal/ignore/ignore.go

@@ -16,8 +16,7 @@ type Filter []Rule
 func New(dir string, patterns ...string) Filter {
 	var rules []Rule
 	for _, p := range patterns {
-		rule := ParseRule(filepath.Join(dir, p))
-		rules = append(rules, rule)
+		rules = append(rules, ParseRule(dir, p))
 	}
 
 	return Filter(rules)

internal/ignore/rule.go

@@ -54,7 +54,7 @@ func (r EmptyRule) Match(name string) (bool, error) {
 }
 
 // ParseRule returns a rule for the given pattern.
-func ParseRule(pattern string) Rule {
+func ParseRule(dir, pattern string) Rule {
 	pattern = strings.TrimSpace(pattern)
 	if pattern == "" {
 		return EmptyRule(pattern)
@@ -66,9 +66,9 @@ func ParseRule(pattern string) Rule {
 
 	var rule Rule
 	if strings.Contains(pattern, "/") {
-		rule = PathRule(pattern)
+		rule = PathRule(filepath.Join(dir, pattern))
 	} else {
-		rule = BaseRule(filepath.Base(pattern))
+		rule = BaseRule(pattern)
 	}
 
 	if strings.HasPrefix(pattern, "!") {

internal/ignore/testdata/.multignore

@@ -2,6 +2,6 @@
 
 foo
 
-!bar
+bar
 
-/foo/bar
+/foo/bar

pkg/fs/testdata/l

@@ -0,0 +1 @@
+b