fix: properly inherit exclude options when not overwritten (#936)

evilmartians · Jan 20, 2025 · 678033f · 678033f
1 parent 40e97fc
commit 678033f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/internal/lefthook/runner/run_jobs.go b/internal/lefthook/runner/run_jobs.go
@@ -101,13 +101,18 @@ func (r *Runner) runJob(ctx context.Context, domain *domain, id string, job *con
 		case []interface{}:
 			switch inherited := inheritedDomain.exclude.(type) {
 			case []interface{}:
+				// List of globs get appended
 				inherited = append(inherited, list...)
 				inheritedDomain.exclude = inherited
 			default:
+				// Regex value will be overwritten with a list of globs
 				inheritedDomain.exclude = job.Exclude
 			}
-		default:
+		case string:
+			// Regex value always overwrites excludes
 			inheritedDomain.exclude = job.Exclude
+		default:
+			// Inherit
 		}
 		groupName := first(job.Name, "group ("+id+")")
 		inheritedDomain.names = append(inheritedDomain.names, groupName)

diff --git a/testdata/exclude.txt b/testdata/exclude.txt
@@ -10,7 +10,7 @@ stdout '^dir/a.txt dir/b.txt lefthook.yml\s*$'
 exec lefthook run -f array
 stdout '^dir/a.txt dir/b.txt\s*$'
 exec lefthook run -f nested
-stdout '^lefthook.yml\s+dir/b.txt lefthook.yml\s+b.txt dir/b.txt\s*$'
+stdout '^lefthook.yml\s+dir/b.txt lefthook.yml\s+b.txt dir/b.txt lefthook.yml\s+b.txt dir/b.txt\s*$'
 
 -- lefthook.yml --
 skip_output:
@@ -50,9 +50,14 @@ nested:
           - exclude:
               - b.txt
             run: echo {staged_files}
-          - exclude:
-              - '*.yml'
-            run: echo {staged_files}
+          - group:
+              jobs:
+                - run: echo {staged_files}
+          - group:
+              jobs:
+                - exclude:
+                    - '*.yml'
+                  run: echo {staged_files}
 -- a.txt --
 a