Added the ability to merge a selected Tag into current branch (jessed…

…uffield#1315)
RetoranPetra · Mar 13, 2024 · e6f03bf · e6f03bf
1 parent 8193731
commit e6f03bf
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
@@ -53,6 +53,11 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
  Description: self.c.Tr.ViewResetOptions,
  OpensMenu: true,
  },
+ {
+ Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
+ Handler: opts.Guards.OutsideFilterMode(self.withSelectedTag(self.merge)),
+ Description: self.c.Tr.MergeIntoCurrentBranch,
+ },
  }
 
  return bindings
@@ -213,6 +218,10 @@ func (self *TagsController) create() error {
  return self.c.Helpers().Tags.OpenCreateTagPrompt("", func() { self.context().SetSelectedLineIdx(0) })
 }
 
+func (self *TagsController) merge(tag *models.Tag) error {
+ return self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(tag.RefName())
+}
+
 func (self *TagsController) withSelectedTag(f func(tag *models.Tag) error) func() error {
  return func() error {
  tag := self.context().GetSelected()