Ditch Rebase, recycles RebaseStatus to show while rebasing

jesseduffield · Jul 31, 2023 · d838088 · d838088
1 parent 808c159
commit d838088
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -225,7 +225,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
 			Key:   's',
 			OnPress: func() error {
 				self.c.LogAction(self.c.Tr.Actions.RebaseBranch)
-				return self.c.WithWaitingStatus(self.c.Tr.Actions.Rebase, func(task gocui.Task) error {
+				return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error {
 					baseCommit := self.c.Modes().MarkedBaseCommit.GetSha()
 					var err error
 					if baseCommit != "" {

diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -616,7 +616,6 @@ type Actions struct {
 	ForceCheckoutBranch               string
 	DeleteBranch                      string
 	Merge                             string
-	Rebase                            string
 	RebaseBranch                      string
 	RenameBranch                      string
 	SetUnsetUpstream                  string
@@ -1338,7 +1337,6 @@ func EnglishTranslationSet() TranslationSet {
 			ForceCheckoutBranch:               "Force checkout branch",
 			DeleteBranch:                      "Delete branch",
 			Merge:                             "Merge",
-			Rebase:                            "Rebasing",
 			RebaseBranch:                      "Rebase branch",
 			RenameBranch:                      "Rename branch",
 			SetUnsetUpstream:                  "Set/Unset upstream",