If execution errors, and --error-exit-code is set, return exit code 1, even without error log lines

hasty · hasty · commit 851bf3bf3861 · 2025-12-03T15:13:42.000-08:00
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -51,10 +51,6 @@ func Execute() {
 		handleError(k, err)
 	}
 
-	if logHadErrors {
-		os.Exit(1)
-	}
-
 	if !commands.SuppressVersionCheck {
 		select {
 		case version := <-versionChan:
@@ -63,6 +59,9 @@ func Execute() {
 		}
 	}
 
+	if logHadErrors || (commands.ErrorExitCode && err != nil) {
+		os.Exit(1)
+	}
 }
 
 var logHadErrors bool

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,6 @@ func Execute() {`
`51`	`51`	`handleError(k, err)`
`52`	`52`	`}`
`53`	`53`
`54`		`- if logHadErrors {`
`55`		`- os.Exit(1)`
`56`		`- }`
`57`		`-`
`58`	`54`	`if !commands.SuppressVersionCheck {`
`59`	`55`	`select {`
`60`	`56`	`case version := <-versionChan:`
`@@ -63,6 +59,9 @@ func Execute() {`
`63`	`59`	`}`
`64`	`60`	`}`
`65`	`61`
	`62`	`+ if logHadErrors \|\| (commands.ErrorExitCode && err != nil) {`
	`63`	`+ os.Exit(1)`
	`64`	`+ }`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`var logHadErrors bool`