mirror of
https://gitee.com/gitea/gitea
synced 2025-12-24 17:26:35 +08:00
Update src-d/go-git to v4.13.0 (#7688)
* update gopkg.in/src-d/go-git.v4 v4.13.0 * mod tidy * vendor
This commit is contained in:
committed by
techknowlogick
parent
bb875e98a1
commit
a9b4c8171f
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/merge_base.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/merge_base.go
generated
vendored
@@ -32,7 +32,7 @@ func (c *Commit) MergeBase(other *Commit) ([]*Commit, error) {
|
||||
var res []*Commit
|
||||
inNewerHistory := isInIndexCommitFilter(newerHistory)
|
||||
resIter := NewFilterCommitIter(older, &inNewerHistory, &inNewerHistory)
|
||||
err = resIter.ForEach(func(commit *Commit) error {
|
||||
_ = resIter.ForEach(func(commit *Commit) error {
|
||||
res = append(res, commit)
|
||||
return nil
|
||||
})
|
||||
|
||||
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/patch.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/patch.go
generated
vendored
@@ -278,7 +278,7 @@ func printStat(fileStats []FileStat) string {
|
||||
var scaleFactor float64
|
||||
if longestTotalChange > heightOfHistogram {
|
||||
// Scale down to heightOfHistogram.
|
||||
scaleFactor = float64(longestTotalChange / heightOfHistogram)
|
||||
scaleFactor = longestTotalChange / heightOfHistogram
|
||||
} else {
|
||||
scaleFactor = 1.0
|
||||
}
|
||||
|
||||
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/tree.go
generated
vendored
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/object/tree.go
generated
vendored
@@ -288,7 +288,7 @@ func (t *Tree) Encode(o plumbing.EncodedObject) (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err = w.Write([]byte(entry.Hash[:])); err != nil {
|
||||
if _, err = w.Write(entry.Hash[:]); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -517,4 +517,4 @@ func simpleJoin(parent, child string) string {
|
||||
return parent + "/" + child
|
||||
}
|
||||
return child
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user