ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Merge pull request #2224 from Ryooooooga/ambiguous-branch

Browse Source
This commit is contained in:
Jesse Duffield
2022-11-14 19:09:37 +11:00
committed by GitHub
parent e953659ebf 52a2e4c1dc
commit de22238589
39 changed files with 150 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/branches_controller.go
View File

@@ -255,7 +255,7 @@ func (self *BranchesController) createNewBranchWithName(newBranchName string) er
return nil
}
if err := self.git.Branch.New(newBranchName, branch.Name); err != nil {
if err := self.git.Branch.New(newBranchName, branch.FullRefName()); err != nil {
return self.c.Error(err)
}
@@ -411,7 +411,7 @@ func (self *BranchesController) rename(branch *models.Branch) error {
}
func (self *BranchesController) newBranch(selectedBranch *models.Branch) error {
return self.helpers.Refs.NewBranch(selectedBranch.RefName(), selectedBranch.RefName(), "")
return self.helpers.Refs.NewBranch(selectedBranch.FullRefName(), selectedBranch.RefName(), "")
}
func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Branch, checkedOutBranch *models.Branch) error {

2
pkg/gui/presentation/icons/git_icons.go
View File

@@ -29,7 +29,7 @@ var remoteIcons = []remoteIcon{
}
func IconForBranch(branch *models.Branch) string {
if branch.DisplayName != "" {
if branch.DetachedHead {
return DETACHED_HEAD_ICON
}
return BRANCH_ICON