fix: bug matching files that are included in gitignore

tj-actions · Mar 17, 2023 · e4b9ee2 · e4b9ee2
1 parent c4f1079
commit e4b9ee2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -106,5 +106,5 @@ lib/**/*
 .idea/
 
 **/*.txt
-!src/__tests__/test1.txt
+!src/__tests__/test.txt
 !src/__tests__/source-files.txt
diff --git a/src/main.ts b/src/main.ts
@@ -153,7 +153,7 @@ export async function run(): Promise<void> {
     }
   }
 
-  filePatterns += `\n${DEFAULT_EXCLUDED_FILES.filter(p => !!p).join('\n')}`
+  filePatterns += `\n${DEFAULT_EXCLUDED_FILES.join('\n')}`
 
   filePatterns = [...new Set(filePatterns.split('\n').filter(p => p !== ''))]
     .map(pt => {
@@ -205,16 +205,23 @@ export async function run(): Promise<void> {
         filePaths: [gitignorePath]
       })
     )
+      .concat(DEFAULT_EXCLUDED_FILES)
       .filter(p => !!p)
       .map(pt => {
-        const parts = pt.split(path.sep)
+        const negated = pt.startsWith('!')
+        const parts = pt.replace(/^!/, '').split(path.sep)
 
         const absolutePath = path.resolve(path.join(workingDirectory, parts[0]))
 
-        return path.join(absolutePath, ...parts.slice(1))
+        return `${negated ? '!' : ''}${path.join(
+          absolutePath,
+          ...parts.slice(1)
+        )}`
       })
       .join('\n')
 
+    core.debug(`gitignore file patterns: ${gitignoreFilePatterns}`)
+
     const gitIgnoreGlobber = await glob.create(
       gitignoreFilePatterns,
       globOptions