fix: skip if any files template is empty (#1275)

Author: mrexox

internal/run/controller/command/build_command.go

@@ -27,7 +27,10 @@ func (b *Builder) buildCommand(params *JobParams) ([]string, []string, error) {
 	}
 
 	// Checking substitutions and skipping execution if it is empty.
-	//
+	if !b.opts.Force && replacer.HasEmpty() {
+		return nil, nil, SkipError{"no files for inspection"}
+	}
+
 	// Special case when `files` option specified but not referenced in `run`: return if the result is empty.
 	if !b.opts.Force && len(params.FilesCmd) > 0 && replacer.Empty(config.SubFiles) {
 		files, err := replacer.Files(config.SubFiles, filter)
@@ -55,10 +58,6 @@ func (b *Builder) buildCommand(params *JobParams) ([]string, []string, error) {
 		}
 
 		if len(files) == 0 {
-			if replacer.Cached(config.SubStagedFiles) {
-				return nil, nil, SkipError{"no matching staged files"}
-			}
-
 			files, err = b.git.StagedFilesWithDeleted()
 			if err != nil {
 				return nil, nil, err

internal/run/controller/command/replacer/replacer.go

@@ -105,6 +105,16 @@ func (r Replacer) Discover(source string, filter *filter.Filter) error {
 	return nil
 }
 
+func (r Replacer) HasEmpty() bool {
+	for _, entry := range r.cache {
+		if len(entry.items) == 0 {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (r Replacer) Cached(key string) bool {
 	_, ok := r.cache[key]
 

tests/integration/run_deleted_only.txt

@@ -7,7 +7,7 @@ exec lefthook install
 exec rm A.txt
 exec git add -A
 exec git commit -m 'test'
-stderr 'no matching staged files'
+stderr 'no files for inspection'
 
 -- lefthook.yml --
 pre-commit: