utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor determineMainBranches to return multiple refs per entry

Browse source
This commit is contained in:
Tom Amberson 2026-02-20 21:41:40 -06:00
parent 1d0db51caf
commit 498a530ab7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/commands/git_commands/main_branches.go
View file

@ -77,10 +77,10 @@ func (self *MainBranches) GetMergeBase(refName string) string {
}
func (self *MainBranches) determineMainBranches(configuredMainBranches []string) []string {
var existingBranches []string
var matchedBranches [][]string
var wg sync.WaitGroup
existingBranches = make([]string, len(configuredMainBranches))
matchedBranches = make([][]string, len(configuredMainBranches))
for i, branchName := range configuredMainBranches {
wg.Add(1)
@ -91,7 +91,7 @@ func (self *MainBranches) determineMainBranches(configuredMainBranches []string)
if ref, err := self.cmd.New(
NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
).DontLog().RunWithOutput(); err == nil {
existingBranches[i] = strings.TrimSpace(ref)
matchedBranches[i] = []string{strings.TrimSpace(ref)}
return
}
@ -101,7 +101,7 @@ func (self *MainBranches) determineMainBranches(configuredMainBranches []string)
if err := self.cmd.New(
NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
).DontLog().Run(); err == nil {
existingBranches[i] = ref
matchedBranches[i] = []string{ref}
return
}
@ -112,16 +112,15 @@ func (self *MainBranches) determineMainBranches(configuredMainBranches []string)
if err := self.cmd.New(
NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
).DontLog().Run(); err == nil {
existingBranches[i] = ref
matchedBranches[i] = []string{ref}
return
}
})
}
wg.Wait()
existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
return branch != ""
})
existingBranches := lo.Flatten(matchedBranches)
return existingBranches
}