Update to go 1.24

pkg/commands/git_commands/branch_loader.go

@@ -3,6 +3,7 @@ package git_commands
 import (
 	"fmt"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -14,7 +15,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -95,8 +95,8 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit,
 
 		// Sort branches that don't have a recency value alphabetically
 		// (we're really doing this for the sake of deterministic behaviour across git versions)
-		slices.SortFunc(branches, func(a *models.Branch, b *models.Branch) bool {
-			return a.Name < b.Name
+		slices.SortFunc(branches, func(a *models.Branch, b *models.Branch) int {
+			return strings.Compare(a.Name, b.Name)
 		})
 
 		branches = utils.Prepend(branches, branchesWithRecency...)

pkg/commands/git_commands/remote_loader.go

@@ -2,6 +2,7 @@ package git_commands
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"sync"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
 )
 
 type RemoteLoader struct {
@@ -67,15 +67,15 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
 	})
 
 	// now lets sort our remotes by name alphabetically
-	slices.SortFunc(remotes, func(a, b *models.Remote) bool {
+	slices.SortFunc(remotes, func(a, b *models.Remote) int {
 		// we want origin at the top because we'll be most likely to want it
 		if a.Name == "origin" {
-			return true
+			return -1
 		}
 		if b.Name == "origin" {
-			return false
+			return 1
 		}
-		return strings.ToLower(a.Name) < strings.ToLower(b.Name)
+		return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
 	})
 
 	return remotes, nil