fix partial matching of globstar patterns

isaacs · isaacs · commit b02ef18f6632 · 2026-02-25T09:09:15.000-08:00
Fix: #284 Backport of 3a0d83b to v5
diff --git a/minimatch.js b/minimatch.js
@@ -277,8 +277,8 @@ class Minimatch {
     }
 
     const head = pattern.slice(patternIndex, firstgs)
-    const body = pattern.slice(firstgs + 1, lastgs)
-    const tail = pattern.slice(lastgs + 1)
+    const body = partial ? pattern.slice(firstgs + 1) : pattern.slice(firstgs + 1, lastgs)
+    const tail = partial ? [] : pattern.slice(lastgs + 1)
 
     // check the head
     if (head.length) {
@@ -321,7 +321,7 @@ class Minimatch {
           return false
         }
       }
-      return sawSome
+      return partial || sawSome
     }
 
     // split body into segments at each GLOBSTAR
@@ -398,7 +398,7 @@ class Minimatch {
       }
       fileIndex++
     }
-    return null
+    return partial || null
   }
 
   _matchOne (file, pattern, partial, fileIndex, patternIndex) {
diff --git a/test/partial.js b/test/partial.js
@@ -1,7 +1,16 @@
 const t = require('tap')
 const mm = require('../')
+
 t.equal(mm('/a/b', '/*/b/x/y/z', { partial: true }), true)
 t.equal(mm('/a/b/c', '/*/b/x/y/z', { partial: true }), false)
 t.equal(mm('/', 'x', { partial: true }), true)
 const m = new mm.Minimatch('/*/b/x/y/z')
 t.equal(m.match('/a/b', true), true)
+t.equal(mm('/b/c/d/a', '/**/a/b/c', { partial: true }), true)
+t.equal(mm('/b/c/d/a', '/**/a/b/c/**', { partial: true }), true)
+
+t.equal(mm('a', 'a/**', { partial: true }), true)
+t.equal(mm('a', '**', { partial: true }), true)
+t.equal(mm('b/a', 'a/**', { partial: true }), false)
+t.equal(mm('/b/c/d/a', '/**/a/**/b/c/**', { partial: true }), true)
+t.equal(mm('/b/c/d/a', '/**/a/**', { partial: true }), true)

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,8 @@ class Minimatch {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`const head = pattern.slice(patternIndex, firstgs)`
`280`		`- const body = pattern.slice(firstgs + 1, lastgs)`
`281`		`- const tail = pattern.slice(lastgs + 1)`
	`280`	`+ const body = partial ? pattern.slice(firstgs + 1) : pattern.slice(firstgs + 1, lastgs)`
	`281`	`+ const tail = partial ? [] : pattern.slice(lastgs + 1)`
`282`	`282`
`283`	`283`	`// check the head`
`284`	`284`	`if (head.length) {`
`@@ -321,7 +321,7 @@ class Minimatch {`
`321`	`321`	`return false`
`322`	`322`	`}`
`323`	`323`	`}`
`324`		`- return sawSome`
	`324`	`+ return partial \|\| sawSome`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`// split body into segments at each GLOBSTAR`
`@@ -398,7 +398,7 @@ class Minimatch {`
`398`	`398`	`}`
`399`	`399`	`fileIndex++`
`400`	`400`	`}`
`401`		`- return null`
	`401`	`+ return partial \|\| null`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`_matchOne (file, pattern, partial, fileIndex, patternIndex) {`