Cleanup: turn around error condition

stefanhaller · stefanhaller · commit f95ac6780f83 · 2025-06-30T16:08:03.000+02:00
It is a common go convention for the "happy path" to be as little indented as
possible.
diff --git a/pkg/commands/git_commands/branch.go b/pkg/commands/git_commands/branch.go
@@ -111,10 +111,11 @@ func (self *BranchCommands) CurrentBranchName() (string, error) {
 		ToArgv()
 
 	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	if err == nil {
-		return strings.TrimSpace(output), nil
+	if err != nil {
+		return "", err
 	}
-	return "", err
+
+	return strings.TrimSpace(output), nil
 }
 
 // LocalDelete delete branch locally

Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,11 @@ func (self *BranchCommands) CurrentBranchName() (string, error) {`
`111`	`111`	`ToArgv()`
`112`	`112`
`113`	`113`	`output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()`
`114`		`- if err == nil {`
`115`		`- return strings.TrimSpace(output), nil`
	`114`	`+ if err != nil {`
	`115`	`+ return "", err`
`116`	`116`	`}`
`117`		`- return "", err`
	`117`	`+`
	`118`	`+ return strings.TrimSpace(output), nil`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`// LocalDelete delete branch locally`