From 70e3df1fa728c3c85978aff27623644425091a49 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 27 Apr 2025 21:41:33 +0200 Subject: [PATCH] WIP Visualize the fixup flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We show fixup↓ for the normal case where the commit message of the bottom commit is retained, and fixup← for the special case where the message of the upper commit is used (e.g. for 'amend!' commits). --- pkg/gui/presentation/commits.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index 63c2b3c9b..f2ad6524d 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -387,7 +387,15 @@ func displayCommit( actionString := "" if commit.Action != models.ActionNone { - actionString = actionColorMap(commit.Action, commit.Status).Sprint(commit.Action.String()) + actionName := commit.Action.String() + if commit.Action == todo.Fixup { + if commit.FixupFlag { + actionName += "←" + } else { + actionName += "↓" + } + } + actionString = actionColorMap(commit.Action, commit.Status).Sprint(actionName) } tagString := ""