summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpikomonde <32364823+pikomonde@users.noreply.github.com>2024-03-20 03:05:19 +0700
committerStefan Haller <stefan@haller-berlin.de>2024-04-12 08:31:40 +0200
commit7f6eea2a55ee6e17660c893a9322d743c5016caf (patch)
tree31a410dd5035bf43d43c886dc46d493a98db4791
parent06624e85d6b0b05d6c18b05292b3e15295d47a2c (diff)
standardize 'Commit Sha' to 'Commit Hash'
-rw-r--r--docs/keybindings/Keybindings_en.md6
-rw-r--r--docs/keybindings/Keybindings_nl.md6
-rw-r--r--pkg/commands/git_commands/bisect.go2
-rw-r--r--pkg/commands/git_commands/bisect_info.go2
-rw-r--r--pkg/commands/git_commands/commit_loader.go2
-rw-r--r--pkg/commands/patch/patch_builder.go4
-rw-r--r--pkg/gui/controllers/helpers/refresh_helper.go2
-rw-r--r--pkg/gui/controllers/tags_controller.go2
-rw-r--r--pkg/gui/presentation/commits.go2
-rw-r--r--pkg/gui/presentation/graph/graph.go2
-rw-r--r--pkg/i18n/dutch.go2
-rw-r--r--pkg/i18n/english.go6
-rwxr-xr-xscripts/bisect.sh2
13 files changed, 20 insertions, 20 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index d3fa58cca..8edeb42bc 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -76,7 +76,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` b `` | View bisect options | |
| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -245,7 +245,7 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
| `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` o `` | Open commit in browser | |
@@ -313,7 +313,7 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
| `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` o `` | Open commit in browser | |
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index 61bc9c414..542786192 100644
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -139,7 +139,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
| `` b `` | View bisect options | |
| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -223,7 +223,7 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` o `` | Open commit in browser | |
@@ -313,7 +313,7 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info |
|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` o `` | Open commit in browser | |
diff --git a/pkg/commands/git_commands/bisect.go b/pkg/commands/git_commands/bisect.go
index 41e99bd3c..6d1d88530 100644
--- a/pkg/commands/git_commands/bisect.go
+++ b/pkg/commands/git_commands/bisect.go
@@ -135,7 +135,7 @@ func (self *BisectCommands) StartWithTerms(oldTerm string, newTerm string) error
}
// tells us whether we've found our problem commit(s). We return a string slice of
-// commit sha's if we're done, and that slice may have more that one item if
+// commit hashes if we're done, and that slice may have more that one item if
// skipped commits are involved.
func (self *BisectCommands) IsDone() (bool, []string, error) {
info := self.GetInfo()
diff --git a/pkg/commands/git_commands/bisect_info.go b/pkg/commands/git_commands/bisect_info.go
index 67293803a..bed5bd9db 100644
--- a/pkg/commands/git_commands/bisect_info.go
+++ b/pkg/commands/git_commands/bisect_info.go
@@ -29,7 +29,7 @@ type BisectInfo struct {
newTerm string // 'bad' by default
oldTerm string // 'good' by default
- // map of commit sha's to their status
+ // map of commit hashes to their status
statusMap map[string]BisectStatus
// the sha of the commit that's under test
diff --git a/pkg/commands/git_commands/commit_loader.go b/pkg/commands/git_commands/commit_loader.go
index df22b91bf..a666359eb 100644
--- a/pkg/commands/git_commands/commit_loader.go
+++ b/pkg/commands/git_commands/commit_loader.go
@@ -559,7 +559,7 @@ func ignoringWarnings(commandOutput string) string {
return lastLine
}
-// getFirstPushedCommit returns the first commit SHA which has been pushed to the ref's upstream.
+// getFirstPushedCommit returns the first commit hash which has been pushed to the ref's upstream.
// all commits above this are deemed unpushed and marked as such.
func (self *CommitLoader) getFirstPushedCommit(refName string) (string, error) {
output, err := self.cmd.New(
diff --git a/pkg/commands/patch/patch_builder.go b/pkg/commands/patch/patch_builder.go
index 0fedacd19..a1e2f5194 100644
--- a/pkg/commands/patch/patch_builder.go
+++ b/pkg/commands/patch/patch_builder.go
@@ -33,7 +33,7 @@ type (
// PatchBuilder manages the building of a patch for a commit to be applied to another commit (or the working tree, or removed from the current commit). We also support building patches from things like stashes, for which there is less flexibility
type PatchBuilder struct {
- // To is the commit sha if we're dealing with files of a commit, or a stash ref for a stash
+ // To is the commit hash if we're dealing with files of a commit, or a stash ref for a stash
To string
From string
reverse bool
@@ -46,7 +46,7 @@ type PatchBuilder struct {
fileInfoMap map[string]*fileInfo
Log *logrus.Entry
- // loadFileDiff loads the diff of a file, for a given to (typically a commit SHA)
+ // loadFileDiff loads the diff of a file, for a given to (typically a commit hash)
loadFileDiff loadFileDiffFunc
}
diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
index 66645e698..a2c01e15d 100644
--- a/pkg/gui/controllers/helpers/refresh_helper.go
+++ b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -267,7 +267,7 @@ func (self *RefreshHelper) refreshCommitsAndCommitFiles() {
_ = self.refreshCommitsWithLimit()
ctx, ok := self.c.Contexts().CommitFiles.GetParentContext()
if ok && ctx.GetKey() == context.LOCAL_COMMITS_CONTEXT_KEY {
- // This makes sense when we've e.g. just amended a commit, meaning we get a new commit SHA at the same position.
+ // This makes sense when we've e.g. just amended a commit, meaning we get a new commit hash at the same position.
// However if we've just added a brand new commit, it pushes the list down by one and so we would end up
// showing the contents of a different commit than the one we initially entered.
// Ideally we would know when to refresh the commit files context and when not to,
diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
index 3d7609f4b..d845f192d 100644
--- a/pkg/gui/controllers/tags_controller.go
+++ b/pkg/gui/controllers/tags_controller.go
@@ -230,7 +230,7 @@ func (self *TagsController) createResetMenu(tag *models.Tag) error {
}
func (self *TagsController) create() error {
- // leaving commit SHA blank so that we're just creating the tag for the current commit
+ // leaving commit hash blank so that we're just creating the tag for the current commit
return self.c.Helpers().Tags.OpenCreateTagPrompt("", func() {
self.context().SetSelection(0)
})
diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go
index c5d5e92e8..58f465196 100644
--- a/pkg/gui/presentation/commits.go
+++ b/pkg/gui/presentation/commits.go
@@ -200,7 +200,7 @@ func indexOfFirstNonTODOCommit(commits []*models.Commit) int {
}
func loadPipesets(commits []*models.Commit) [][]*graph.Pipe {
- // given that our cache key is a commit sha and a commit count, it's very important that we don't actually try to render pipes
+ // given that our cache key is a commit hash and a commit count, it's very important that we don't actually try to render pipes
// when dealing with things like filtered commits.
cacheKey := pipeSetCacheKey{
commitSha: commits[0].Sha,
diff --git a/pkg/gui/presentation/graph/graph.go b/pkg/gui/presentation/graph/graph.go
index f6ecf6f0c..51a55acea 100644
--- a/pkg/gui/presentation/graph/graph.go
+++ b/pkg/gui/presentation/graph/graph.go
@@ -385,7 +385,7 @@ func renderPipeSet(
}
func equalHashes(a, b string) bool {
- // if our selectedCommitSha is an empty string we treat that as meaning there is no selected commit sha
+ // if our selectedCommitSha is an empty string we treat that as meaning there is no selected commit hash
if a == "" || b == "" {
return false
}
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 0341d811e..6eccd3f22 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -308,7 +308,7 @@ func dutchTranslationSet() TranslationSet {
SwapDiff: "Keer diff richting om",
ViewDiffingOptions: "Open diff menu",
ShowingGitDiff: "Laat output zien voor:",
- CopyCommitShaToClipboard: "Kopieer commit SHA naar klembord",
+ CopyCommitShaToClipboard: "Kopieer commit hash naar klembord",
CopyCommitMessageToClipboard: "Kopieer commit bericht naar klembord",
CopyBranchNameToClipboard: "Kopieer branch name naar klembord",
CopyPathToClipboard: "Kopieer de bestandsnaam naar het klembord",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 77e2432ad..04da3eb17 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -1534,8 +1534,8 @@ func EnglishTranslationSet() TranslationSet {
OpenCommandLogMenuTooltip: "View options for the command log e.g. show/hide the command log and focus the command log.",
ShowingGitDiff: "Showing output for:",
CommitDiff: "Commit diff",
- CopyCommitShaToClipboard: "Copy commit SHA to clipboard",
- CommitSha: "Commit SHA",
+ CopyCommitShaToClipboard: "Copy commit hash to clipboard",
+ CommitSha: "commit hash",
CommitURL: "Commit URL",
CopyCommitMessageToClipboard: "Copy commit message to clipboard",
CommitMessage: "Commit message",
@@ -1772,7 +1772,7 @@ func EnglishTranslationSet() TranslationSet {
CopyCommitMessageToClipboard: "Copy commit message to clipboard",
CopyCommitSubjectToClipboard: "Copy commit subject to clipboard",
CopyCommitDiffToClipboard: "Copy commit diff to clipboard",
- CopyCommitSHAToClipboard: "Copy full commit SHA to clipboard",
+ CopyCommitSHAToClipboard: "Copy full commit hash to clipboard",
CopyCommitURLToClipboard: "Copy commit URL to clipboard",
CopyCommitAuthorToClipboard: "Copy commit author to clipboard",
CopyCommitAttributeToClipboard: "Copy to clipboard",
diff --git a/scripts/bisect.sh b/scripts/bisect.sh
index a3bc5f19e..3652a85b8 100755
--- a/scripts/bisect.sh
+++ b/scripts/bisect.sh
@@ -4,7 +4,7 @@
# 1) find a commit that is working fine.
# 2) Create an integration test capturing the fact that it works (Don't commit it). See https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md
# 3) checkout the commit that's known to be failing
-# 4) run this script supplying the commit sha / tag name that works and the name of the newly created test
+# 4) run this script supplying the commit hash / tag name that works and the name of the newly created test
# usage: scripts/bisect.sh <ref that's broken> <ref that's working> <integration test name>
# e.g. scripts/bisect.sh v0.32.1 mergeConflictsResolvedExternally