Skip to content

Commit df6a862

Browse files
committed
WIP Visualize the fixup flag
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).
1 parent dc66f20 commit df6a862

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

pkg/gui/presentation/commits.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,15 @@ func displayCommit(
387387

388388
actionString := ""
389389
if commit.Action != models.ActionNone {
390-
actionString = actionColorMap(commit.Action, commit.Status).Sprint(commit.Action.String())
390+
actionName := commit.Action.String()
391+
if commit.Action == todo.Fixup {
392+
if commit.FixupFlag {
393+
actionName += "←"
394+
} else {
395+
actionName += "↓"
396+
}
397+
}
398+
actionString = actionColorMap(commit.Action, commit.Status).Sprint(actionName)
391399
}
392400

393401
tagString := ""

0 commit comments

Comments
 (0)