go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-23 12:18:51 +02:00
Code Issues Releases Activity

Fix checking out a tag when a branch with the same name exists

Browse Source
This commit is contained in:
Stefan Haller 2023-12-22 15:30:54 +01:00
parent 2b97f0fb43
commit f244ec8251
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/tags_controller.go
View File

@ -83,7 +83,7 @@ func (self *TagsController) GetOnRenderToMain() func() error {
func (self *TagsController) checkout(tag *models.Tag) error { func (self *TagsController) checkout(tag *models.Tag) error {
self.c.LogAction(self.c.Tr.Actions.CheckoutTag) self.c.LogAction(self.c.Tr.Actions.CheckoutTag)
if err := self.c.Helpers().Refs.CheckoutRef(tag.Name, types.CheckoutRefOptions{}); err != nil { if err := self.c.Helpers().Refs.CheckoutRef(tag.FullRefName(), types.CheckoutRefOptions{}); err != nil {
return err return err
} }
return self.c.PushContext(self.c.Contexts().Branches) return self.c.PushContext(self.c.Contexts().Branches)

4
pkg/integration/tests/tag/checkout_when_branch_with_same_name_exists.go
View File

@ -26,13 +26,9 @@ var CheckoutWhenBranchWithSameNameExists = NewIntegrationTest(NewIntegrationTest
PressPrimaryAction() // checkout tag PressPrimaryAction() // checkout tag
t.Views().Branches().IsFocused().Lines( t.Views().Branches().IsFocused().Lines(
/* EXPECTED:
Contains("HEAD detached at tag").IsSelected(), Contains("HEAD detached at tag").IsSelected(),
Contains("master"), Contains("master"),
Contains("tag"), Contains("tag"),
ACTUAL: */
Contains("* tag").DoesNotContain("HEAD detached").IsSelected(),
Contains("master"),
) )
}, },
}) })