fix: fail the hook if git-lfs command failed

evilmartians · May 29, 2024 · 24872b4 · 24872b4
1 parent b1a5d7a
commit 24872b4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/internal/lefthook/run.go b/internal/lefthook/run.go
@@ -169,7 +169,10 @@ Run 'lefthook install' manually.`,
 	)
 
 	startTime := time.Now()
-	results := r.RunAll(ctx, sourceDirs)
+	results, runErr := r.RunAll(ctx, sourceDirs)
+	if runErr != nil {
+		return runErr
+	}
 
 	if ctx.Err() != nil {
 		return errors.New("Interrupted")

diff --git a/internal/lefthook/runner/runner.go b/internal/lefthook/runner/runner.go
@@ -84,16 +84,16 @@ type executable interface {
 
 // RunAll runs scripts and commands.
 // LFS hook is executed at first if needed.
-func (r *Runner) RunAll(ctx context.Context, sourceDirs []string) []Result {
+func (r *Runner) RunAll(ctx context.Context, sourceDirs []string) ([]Result, error) {
 	results := make([]Result, 0, len(r.Hook.Commands)+len(r.Hook.Scripts))
 
 	if err := r.runLFSHook(ctx); err != nil {
-		log.Error(err)
+		return results, err
 	}
 
 	if r.Hook.DoSkip(r.Repo.State()) {
 		r.logSkip(r.HookName, "hook setting")
-		return results
+		return results, nil
 	}
 
 	if !r.DisableTTY && !r.Hook.Follow {
@@ -118,7 +118,7 @@ func (r *Runner) RunAll(ctx context.Context, sourceDirs []string) []Result {
 
 	r.postHook()
 
-	return results
+	return results, nil
 }
 
 func (r *Runner) runLFSHook(ctx context.Context) error {

diff --git a/internal/lefthook/runner/runner_test.go b/internal/lefthook/runner/runner_test.go
@@ -766,7 +766,10 @@ func TestRunAll(t *testing.T) {
 		}
 
 		t.Run(fmt.Sprintf("%d: %s", i, tt.name), func(t *testing.T) {
-			results := runner.RunAll(context.Background(), tt.sourceDirs)
+			results, err := runner.RunAll(context.Background(), tt.sourceDirs)
+			if err != nil {
+				t.Errorf("unexpected error %s", err)
+			}
 
 			var success, fail []Result
 			for _, result := range results {