mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-13 05:15:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump go-git to fix invalid merge error

Browse source
This commit is contained in:
Jesse Duffield 2020-10-06 21:00:36 +11:00
parent 6e076472b8
commit 0aed47737c
61 changed files with 1534 additions and 1927 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/github.com/jesseduffield/go-git/v5/config/branch.go generated vendored
View file

@ -78,13 +78,11 @@ func (b *Branch) marshal() *format.Subsection {
return b.raw
}
func (b *Branch) unmarshal(s *format.Subsection) error {
func (b *Branch) unmarshal(s *format.Subsection) {
b.raw = s
b.Name = b.raw.Name
b.Remote = b.raw.Options.Get(remoteSection)
b.Merge = plumbing.ReferenceName(b.raw.Options.Get(mergeKey))
b.Rebase = b.raw.Options.Get(rebaseKey)
return b.Validate()
}

9
vendor/github.com/jesseduffield/go-git/v5/config/config.go generated vendored
View file

@ -256,8 +256,6 @@ func (c *Config) Unmarshal(b []byte) error {
}
unmarshalSubmodules(c.Raw, c.Submodules)
// ignore error
// Why ignore the error? It seems overly strict and for my use case none of the errors matter to me
c.unmarshalBranches()
return c.unmarshalRemotes()
@ -330,18 +328,15 @@ func unmarshalSubmodules(fc *format.Config, submodules map[string]*Submodule) {
}
}
func (c *Config) unmarshalBranches() error {
func (c *Config) unmarshalBranches() {
bs := c.Raw.Section(branchSection)
for _, sub := range bs.Subsections {
b := &Branch{}
if err := b.unmarshal(sub); err != nil {
// ignore error
}
b.unmarshal(sub)
c.Branches[b.Name] = b
}
return nil
}
// Marshal returns Config encoded as a git-config file.