From 53e9c730349c92f3a22d0d977242d68e20395cb9 Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Sat, 19 Sep 2026 09:00:11 +0200
Subject: [PATCH] Separate the text of a commit's hash, bisect and action cells
 from its styling

These three cells are built and styled in one step, so their width can
only be measured by stripping the styling off again. A later commit needs
those widths to reserve space for the columns they go into. Pull the text
out into getHashText, getActionText and a getBisectStatusText that no
longer styles what it returns, and apply the styling at the call site.

A commit with no hash, such as a "break" or "update-ref" todo, now gets an
empty hash cell instead of one holding nothing but colour codes. Nothing
can see the difference: both render as the same number of blank columns.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 pkg/gui/presentation/commits.go | 68 ++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go
index 67fa62ac8..4bad77ce9 100644
--- a/pkg/gui/presentation/commits.go
+++ b/pkg/gui/presentation/commits.go
@@ -313,24 +313,18 @@ func getBisectStatus(index int, commitHash string, bisectInfo *git_commands.Bise
 }
 
 func getBisectStatusText(bisectStatus BisectStatus, bisectInfo *git_commands.BisectInfo) string {
-	if bisectStatus == BisectStatusNone {
-		return ""
-	}
-
-	style := getBisectStatusColor(bisectStatus)
-
 	switch bisectStatus {
 	case BisectStatusNew:
-		return style.Sprintf("<-- " + bisectInfo.NewTerm())
+		return "<-- " + bisectInfo.NewTerm()
 	case BisectStatusOld:
-		return style.Sprintf("<-- " + bisectInfo.OldTerm())
+		return "<-- " + bisectInfo.OldTerm()
 	case BisectStatusCurrent:
 		// TODO: i18n
-		return style.Sprintf("<-- current")
+		return "<-- current"
 	case BisectStatusSkipped:
-		return style.Sprintf("<-- skipped")
+		return "<-- skipped"
 	case BisectStatusCandidate:
-		return style.Sprintf("?")
+		return "?"
 	case BisectStatusNone:
 		return ""
 	}
@@ -338,6 +332,33 @@ func getBisectStatusText(bisectStatus BisectStatus, bisectInfo *git_commands.Bis
 	return ""
 }
 
+func getHashText(commit *models.Commit, hashLength int) string {
+	hash := commit.Hash()
+	if hashLength >= len(hash) {
+		return hash
+	}
+	if hashLength > 0 {
+		return hash[:hashLength]
+	}
+	if !icons.IsIconEnabled() { // hashLength <= 0
+		return "*"
+	}
+	return ""
+}
+
+func getActionText(commit *models.Commit) string {
+	if commit.Action == models.ActionNone {
+		return ""
+	}
+
+	text := commit.Action.String()
+	// Only show the flag for fixup commands (where -C changes the meaning)
+	if commit.ActionFlag != "" && commit.Action == todo.Fixup {
+		text += " " + commit.ActionFlag
+	}
+	return text
+}
+
 func displayCommit(
 	common *common.Common,
 	commit *models.Commit,
@@ -356,17 +377,15 @@ func displayCommit(
 	bisectStatus BisectStatus,
 	bisectInfo *git_commands.BisectInfo,
 ) []string {
-	bisectString := getBisectStatusText(bisectStatus, bisectInfo)
+	bisectString := ""
+	if bisectText := getBisectStatusText(bisectStatus, bisectInfo); bisectText != "" {
+		bisectString = getBisectStatusColor(bisectStatus).Sprint(bisectText)
+	}
 
-	hashString := ""
 	hashColor := getHashColor(commit, diffName, cherryPickedCommitHashSet, bisectStatus, bisectInfo)
-	hashLength := common.UserConfig().Gui.CommitHashLength
-	if hashLength >= len(commit.Hash()) {
-		hashString = hashColor.Sprint(commit.Hash())
-	} else if hashLength > 0 {
-		hashString = hashColor.Sprint(commit.Hash()[:hashLength])
-	} else if !icons.IsIconEnabled() { // hashLength <= 0
-		hashString = hashColor.Sprint("*")
+	hashString := ""
+	if hashText := getHashText(commit, common.UserConfig().Gui.CommitHashLength); hashText != "" {
+		hashString = hashColor.Sprint(hashText)
 	}
 
 	divergenceString := ""
@@ -384,13 +403,8 @@ func displayCommit(
 	}
 
 	actionString := ""
-	if commit.Action != models.ActionNone {
-		actionStr := commit.Action.String()
-		// Only show the flag for fixup commands (where -C changes the meaning)
-		if commit.ActionFlag != "" && commit.Action == todo.Fixup {
-			actionStr += " " + commit.ActionFlag
-		}
-		actionString = actionColorMap(commit.Action, commit.Status).Sprint(actionStr)
+	if actionText := getActionText(commit); actionText != "" {
+		actionString = actionColorMap(commit.Action, commit.Status).Sprint(actionText)
 	}
 
 	tagString := ""