correct ** vs ./** behavior

isaacs · isaacs · commit c3be35ae0331 · 2023-02-26T22:04:02.000-08:00
The previous implementation was only valid prior to minimatch preserving
the leading portions before an initial **, resulting in some incorrect
follows in some cases.  Now that we can determine whether the ** leads
the pattern, the corrected behavior is more easily implemented.
diff --git a/src/processor.ts b/src/processor.ts
@@ -146,12 +146,14 @@ export class Processor {
         // if it's a symlink, but we didn't get here by way of a
         // globstar match (meaning it's the first time THIS globstar
         // has traversed a symlink), then we follow it. Otherwise, stop.
-        if (
-          !t.isSymbolicLink() ||
-          this.follow ||
-          pattern.followGlobstar()
-        ) {
+        if (this.follow || !t.isSymbolicLink()) {
           this.subwalks.add(t, pattern)
+        } else if (
+          t.isSymbolicLink() &&
+          pattern.followGlobstar() &&
+          rest
+        ) {
+          this.subwalks.add(t, rest)
         }
         const rp = rest?.pattern()
         const rrest = rest?.rest()
@@ -219,12 +221,6 @@ export class Processor {
     if (!pattern.hasMore()) {
       this.matches.add(e, absolute, false)
     }
-    // record that this globstar is following a symlink, so we
-    // can know to stop traversing when we encounter it again
-    // in processPatterns.
-    if (e.isSymbolicLink()) {
-      pattern.followGlobstar()
-    }
     if (e.canReaddir()) {
       this.subwalks.add(e, pattern)
     }
