diff --git a/pkg/commands/models/branch.go b/pkg/commands/models/branch.go index 04f869ebd..4dc48a88d 100644 --- a/pkg/commands/models/branch.go +++ b/pkg/commands/models/branch.go @@ -53,6 +53,10 @@ func (b *Branch) RefName() string { return b.Name } +func (b *Branch) ShortRefName() string { + return b.RefName() +} + func (b *Branch) ParentRefName() string { return b.RefName() + "^" } diff --git a/pkg/commands/models/commit.go b/pkg/commands/models/commit.go index 95e3b9b18..50bcfab8f 100644 --- a/pkg/commands/models/commit.go +++ b/pkg/commands/models/commit.go @@ -70,6 +70,10 @@ func (c *Commit) RefName() string { return c.Hash } +func (c *Commit) ShortRefName() string { + return c.Hash[:7] +} + func (c *Commit) ParentRefName() string { if c.IsFirstCommit() { return EmptyTreeCommitHash diff --git a/pkg/commands/models/remote_branch.go b/pkg/commands/models/remote_branch.go index 6a26f05f9..1e89ef582 100644 --- a/pkg/commands/models/remote_branch.go +++ b/pkg/commands/models/remote_branch.go @@ -18,6 +18,10 @@ func (r *RemoteBranch) RefName() string { return r.FullName() } +func (r *RemoteBranch) ShortRefName() string { + return r.RefName() +} + func (r *RemoteBranch) ParentRefName() string { return r.RefName() + "^" } diff --git a/pkg/commands/models/stash_entry.go b/pkg/commands/models/stash_entry.go index 2a1cc8435..a88ab61f6 100644 --- a/pkg/commands/models/stash_entry.go +++ b/pkg/commands/models/stash_entry.go @@ -17,6 +17,10 @@ func (s *StashEntry) RefName() string { return fmt.Sprintf("stash@{%d}", s.Index) } +func (s *StashEntry) ShortRefName() string { + return s.RefName() +} + func (s *StashEntry) ParentRefName() string { return s.RefName() + "^" } diff --git a/pkg/commands/models/tag.go b/pkg/commands/models/tag.go index 24cb83254..876e2cd77 100644 --- a/pkg/commands/models/tag.go +++ b/pkg/commands/models/tag.go @@ -16,6 +16,10 @@ func (t *Tag) RefName() string { return t.Name } +func (t *Tag) ShortRefName() string { + return t.RefName() +} + func (t *Tag) ParentRefName() string { return t.RefName() + "^" } diff --git a/pkg/gui/types/ref.go b/pkg/gui/types/ref.go index e83d91b65..4319f12e0 100644 --- a/pkg/gui/types/ref.go +++ b/pkg/gui/types/ref.go @@ -3,6 +3,7 @@ package types type Ref interface { FullRefName() string RefName() string + ShortRefName() string ParentRefName() string Description() string }