commit 0137a7f2a025a2ac08e536b207ded2d58e928e32
author Josh Bleecher Snyder <josharian@gmail.com> Wed Apr 30 01:16:35 2025 +0000
committer Josh Bleecher Snyder <josharian@gmail.com> Tue Apr 29 19:06:19 2025 -0700
tree 3834c7b2a22a9e9564e67120346ae8e9eb9354fc
parent d499fd6e12374193df2d769d12753bbd1ddd1493

Improve git cherry-pick display with abbreviated SHA/branch references

This change modifies how git cherry-pick commands are displayed in the UI.
Instead of showing full SHA hashes, it now attempts to:
1. Show branch/tag names if available
2. Fall back to abbreviated SHA via git rev-parse --short
3. Use the original full SHA only if the above methods fail

This makes cherry-pick commands more readable and user-friendly.

Co-Authored-By: sketch <hello@sketch.dev>

termui/termui.go

diff --git a/termui/termui.go b/termui/termui.go
index 36e5701..82ae67c 100644
--- a/termui/termui.go
+++ b/termui/termui.go
@@ -232,9 +232,10 @@
 					branches = append(branches, branch)
 				}
 
+				initialCommitRef := getGitRefName(ui.agent.InitialCommit())
 				if len(branches) == 1 {
 					ui.AppendSystemMessage("\n🔄 Branch pushed during session: %s", branches[0])
-					ui.AppendSystemMessage("🍒 To add those changes to your branch: git cherry-pick %s..%s", ui.agent.InitialCommit(), branches[0])
+					ui.AppendSystemMessage("🍒 To add those changes to your branch: git cherry-pick %s..%s", initialCommitRef, branches[0])
 				} else {
 					ui.AppendSystemMessage("\n🔄 Branches pushed during session:")
 					for _, branch := range branches {
@@ -242,7 +243,7 @@
 					}
 					ui.AppendSystemMessage("\n🍒 To add all those changes to your branch:")
 					for _, branch := range branches {
-						ui.AppendSystemMessage("git cherry-pick %s..%s", ui.agent.InitialCommit(), branch)
+						ui.AppendSystemMessage("git cherry-pick %s..%s", initialCommitRef, branch)
 					}
 				}
 			}
@@ -388,3 +389,29 @@
 func (ui *termUI) AppendSystemMessage(fmtString string, args ...any) {
 	ui.termLogCh <- fmt.Sprintf(fmtString, args...)
 }
+
+// getGitRefName returns a readable git ref for sha, falling back to the original sha on error.
+func getGitRefName(sha string) string {
+	// branch or tag name
+	cmd := exec.Command("git", "rev-parse", "--abbrev-ref", sha)
+	branchName, err := cmd.Output()
+	if err == nil {
+		branchStr := strings.TrimSpace(string(branchName))
+		// If we got a branch name that's not HEAD, use it
+		if branchStr != "" && branchStr != "HEAD" {
+			return branchStr
+		}
+	}
+
+	// short SHA
+	cmd = exec.Command("git", "rev-parse", "--short", sha)
+	shortSha, err := cmd.Output()
+	if err == nil {
+		shortStr := strings.TrimSpace(string(shortSha))
+		if shortStr != "" {
+			return shortStr
+		}
+	}
+
+	return sha
+}