diff options
author | pikomonde <32364823+pikomonde@users.noreply.github.com> | 2024-03-21 01:59:00 +0700 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2024-04-12 08:33:47 +0200 |
commit | 05fb12b1d58a664ac2b9d392979d0f71490ea28a (patch) | |
tree | 3057bc3f716328e9c8d610c1bcace4f1bcd11d36 /pkg/gui/presentation | |
parent | 9cf1ca10a20e5897012c853887f8ce64c885cd84 (diff) |
rename sha to hash 6, update short hash
Diffstat (limited to 'pkg/gui/presentation')
-rw-r--r-- | pkg/gui/presentation/branches.go | 2 | ||||
-rw-r--r-- | pkg/gui/presentation/commits.go | 2 | ||||
-rw-r--r-- | pkg/gui/presentation/reflog_commits.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go index 9d0625ea1..0abf2d4cd 100644 --- a/pkg/gui/presentation/branches.go +++ b/pkg/gui/presentation/branches.go @@ -106,7 +106,7 @@ func getBranchDisplayStrings( } if showCommitHash { - res = append(res, utils.ShortSha(b.CommitHash)) + res = append(res, utils.ShortHash(b.CommitHash)) } res = append(res, coloredName) diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index 8823d508e..357146126 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -373,7 +373,7 @@ func displayCommit( } else if icons.IsIconEnabled() { cols = append(cols, shaColor.Sprint(icons.IconForCommit(commit))) } - cols = append(cols, shaColor.Sprint(commit.ShortSha())) + cols = append(cols, shaColor.Sprint(commit.ShortHash())) cols = append(cols, bisectString) if fullDescription { cols = append(cols, style.FgBlue.Sprint( diff --git a/pkg/gui/presentation/reflog_commits.go b/pkg/gui/presentation/reflog_commits.go index b520521cc..243fea1a3 100644 --- a/pkg/gui/presentation/reflog_commits.go +++ b/pkg/gui/presentation/reflog_commits.go @@ -64,7 +64,7 @@ func getFullDescriptionDisplayStringsForReflogCommit(c *models.Commit, attrs ref } return []string{ - reflogShaColor(attrs.cherryPicked, attrs.diffed).Sprint(c.ShortSha()), + reflogShaColor(attrs.cherryPicked, attrs.diffed).Sprint(c.ShortHash()), style.FgMagenta.Sprint(utils.UnixToDateSmart(attrs.now, c.UnixTimestamp, attrs.timeFormat, attrs.shortTimeFormat)), theme.DefaultTextColor.Sprint(name), } @@ -77,7 +77,7 @@ func getDisplayStringsForReflogCommit(c *models.Commit, attrs reflogCommitDispla } return []string{ - reflogShaColor(attrs.cherryPicked, attrs.diffed).Sprint(c.ShortSha()), + reflogShaColor(attrs.cherryPicked, attrs.diffed).Sprint(c.ShortHash()), theme.DefaultTextColor.Sprint(name), } } |