diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2023-07-11 12:13:40 +0200 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-31 08:34:01 +0200 |
commit | 6dc25d796b0315764c4c50a590dde91c802ea5dc (patch) | |
tree | c64ffa1abeb0f99b1318166fd28c6bd24105c0be /pkg/gui/context/local_commits_context.go | |
parent | 0c07963a2e76c54cbde14dc2da20450454f0e286 (diff) |
Visualize local branch heads in commits panel
We want to mark all local branch heads with a "*" in the local commits panel, to
make it easier to see how branches are stacked onto each other. In order to not
confuse users with "*" markers that they don't understand, do this only for the
case where users actually use stacked branches; those users are likely not going
to be confused by the display. This means we want to filter out a few branch
heads that shouldn't get the marker: the current branch, any main branch, and
any old branch that has been merged to master already.
Diffstat (limited to 'pkg/gui/context/local_commits_context.go')
-rw-r--r-- | pkg/gui/context/local_commits_context.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go index 84204591c..9da76104c 100644 --- a/pkg/gui/context/local_commits_context.go +++ b/pkg/gui/context/local_commits_context.go @@ -42,6 +42,8 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { return presentation.GetCommitListDisplayStrings( c.Common, c.Model().Commits, + c.Model().Branches, + c.Model().CheckedOutBranch, c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.Modes().CherryPicking.SelectedShaSet(), c.Modes().Diffing.Ref, |