diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-02-24 12:38:49 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-03-02 10:17:58 +0100 |
| commit | 416a40b0e69605399bde4b03a0ed48977da1dae8 (patch) | |
| tree | 822dc5c7486b556caed40dddf0a654b1f95cd51e /pkg/gui/presentation | |
| parent | 418b316fabf394e14a7c1153f514a52bee48ec39 (diff) | |
Don't show branch head on rebase todos if the rebase.updateRefs config is on
The additional branch head icon is more confusing than useful in this situation.
The update-ref entries show very clearly where the branch heads will go when
continuing the rebase; the information where the branch heads used to be before
the rebase is not really needed here, and just makes the display more confusing.
I'm not adding more tests here because the changes to the existing tests
demonstrate the change clearly enough.
Diffstat (limited to 'pkg/gui/presentation')
| -rw-r--r-- | pkg/gui/presentation/commits.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index 97f7c801d..bd4057e41 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -145,6 +145,7 @@ func GetCommitListDisplayStrings( common, commit, branchHeadsToVisualize, + hasRebaseUpdateRefsConfig, cherryPickedCommitShaSet, isMarkedBaseCommit, willBeRebased, @@ -296,6 +297,7 @@ func displayCommit( common *common.Common, commit *models.Commit, branchHeadsToVisualize *set.Set[string], + hasRebaseUpdateRefsConfig bool, cherryPickedCommitShaSet *set.Set[string], isMarkedBaseCommit bool, willBeRebased bool, @@ -329,7 +331,11 @@ func displayCommit( tagString = theme.DiffTerminalColor.SetBold().Sprint(strings.Join(commit.Tags, " ")) + " " } - if branchHeadsToVisualize.Includes(commit.Sha) && commit.Status != models.StatusMerged { + if branchHeadsToVisualize.Includes(commit.Sha) && + // Don't show branch head on commits that are already merged to a main branch + commit.Status != models.StatusMerged && + // Don't show branch head on a "pick" todo if the rebase.updateRefs config is on + !(commit.IsTODO() && hasRebaseUpdateRefsConfig) { tagString = style.FgCyan.SetBold().Sprint( lo.Ternary(icons.IsIconEnabled(), icons.BRANCH_ICON, "*") + " " + tagString) } |