go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

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()
}