diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-04-05 16:09:36 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-04-15 08:36:03 +0200 |
| commit | d675eb65077fee840d2ed7b13a0ee038611664b6 (patch) | |
| tree | d00d7786582818ec580d729693831dca1bcdb6ea /pkg/i18n | |
| parent | dc4e88f8a48bd52160a76b79da56e13af7b9ffc0 (diff) | |
Don't allow changing the type of certain rebase todos
We already show "merge" todo entries when starting an interactive rebase with
--rebase-merges outside of lazygit. Changing the type of a merge entry to "pick"
or "edit" doesn't make sense and shouldn't be allowed. Earlier in this branch we
have started to show "update-ref" entries, these can't be changed either (they
can be moved, though).
You might argue that it should be possible to change them to "drop", but in the
case of "update-ref" this doesn't make sense either, because "drop" needs a Sha
and we don't have one here. Also, you would then be able to later change it back
to "pick", so we would have to remember that this isn't allowed for this
particular drop entry; that's messy, so just disallow all editing.
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 7b6642882..80179f365 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -219,6 +219,7 @@ type TranslationSet struct { YouAreHere string YouDied string LcRewordNotSupported string + LcChangingThisActionIsNotAllowed string LcCherryPickCopy string LcCherryPickCopyRange string LcPasteCommits string @@ -887,6 +888,7 @@ func EnglishTranslationSet() TranslationSet { YouAreHere: "YOU ARE HERE", YouDied: "YOU DIED!", LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported", + LcChangingThisActionIsNotAllowed: "changing this kind of rebase todo entry is not allowed", LcCherryPickCopy: "copy commit (cherry-pick)", LcCherryPickCopyRange: "copy commit range (cherry-pick)", LcPasteCommits: "paste commits (cherry-pick)", |