WIP see if this fixes the tests

If it does, I'll make it a PR of its own, with proper commit message and maybe
more tests.

Author: stefanhaller

pkg/commands/git_commands/branch_loader.go

@@ -267,18 +267,14 @@ func (self *BranchLoader) getRawBranches() (string, error) {
 		"%00",
 	)
 
-	var sortOrder string
+	sortOrderArgs := []string{"--sort=refname"}
 	switch strings.ToLower(self.UserConfig().Git.LocalBranchSortOrder) {
 	case "recency", "date":
-		sortOrder = "-committerdate"
-	case "alphabetical":
-		sortOrder = "refname"
-	default:
-		sortOrder = "refname"
+		sortOrderArgs = append(sortOrderArgs, "--sort=-committerdate")
 	}
 
 	cmdArgs := NewGitCmd("for-each-ref").
-		Arg(fmt.Sprintf("--sort=%s", sortOrder)).
+		Arg(sortOrderArgs...).
 		Arg(fmt.Sprintf("--format=%s", format)).
 		Arg("refs/heads").
 		ToArgv()

pkg/commands/git_commands/remote_loader.go

@@ -1,7 +1,6 @@
 package git_commands
 
 import (
-	"fmt"
 	"slices"
 	"strings"
 	"sync"
@@ -84,18 +83,13 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
 func (self *RemoteLoader) getRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) {
 	remoteBranchesByRemoteName := make(map[string][]*models.RemoteBranch)
 
-	var sortOrder string
-	switch strings.ToLower(self.UserConfig().Git.RemoteBranchSortOrder) {
-	case "alphabetical":
-		sortOrder = "refname"
-	case "date":
-		sortOrder = "-committerdate"
-	default:
-		sortOrder = "refname"
+	sortOrderArgs := []string{"--sort=refname"}
+	if strings.ToLower(self.UserConfig().Git.RemoteBranchSortOrder) == "date" {
+		sortOrderArgs = append(sortOrderArgs, "--sort=-committerdate")
 	}
 
 	cmdArgs := NewGitCmd("for-each-ref").
-		Arg(fmt.Sprintf("--sort=%s", sortOrder)).
+		Arg(sortOrderArgs...).
 		Arg("--format=%(refname)").
 		Arg("refs/remotes").
 		ToArgv()