mirror of
https://github.com/go-gitea/gitea.git
synced 2025-09-12 14:20:47 +00: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
14
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/encoder.go
generated
vendored
14
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/encoder.go
generated
vendored
@@ -24,8 +24,6 @@ func NewEncoder(w io.Writer) *Encoder {
|
||||
|
||||
// Encode writes an index into the commit-graph file
|
||||
func (e *Encoder) Encode(idx Index) error {
|
||||
var err error
|
||||
|
||||
// Get all the hashes in the input index
|
||||
hashes := idx.Hashes()
|
||||
|
||||
@@ -39,26 +37,26 @@ func (e *Encoder) Encode(idx Index) error {
|
||||
chunkSizes = append(chunkSizes, uint64(extraEdgesCount)*4)
|
||||
}
|
||||
|
||||
if err = e.encodeFileHeader(len(chunkSignatures)); err != nil {
|
||||
if err := e.encodeFileHeader(len(chunkSignatures)); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = e.encodeChunkHeaders(chunkSignatures, chunkSizes); err != nil {
|
||||
if err := e.encodeChunkHeaders(chunkSignatures, chunkSizes); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = e.encodeFanout(fanout); err != nil {
|
||||
if err := e.encodeFanout(fanout); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = e.encodeOidLookup(hashes); err != nil {
|
||||
if err := e.encodeOidLookup(hashes); err != nil {
|
||||
return err
|
||||
}
|
||||
if extraEdges, err := e.encodeCommitData(hashes, hashToIndex, idx); err == nil {
|
||||
if err = e.encodeExtraEdges(extraEdges); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
} else {
|
||||
return err
|
||||
}
|
||||
|
||||
return e.encodeChecksum()
|
||||
}
|
||||
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/file.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/file.go
generated
vendored
@@ -249,7 +249,7 @@ func (fi *fileIndex) getHashesFromIndexes(indexes []int) ([]plumbing.Hash, error
|
||||
// Hashes returns all the hashes that are available in the index
|
||||
func (fi *fileIndex) Hashes() []plumbing.Hash {
|
||||
hashes := make([]plumbing.Hash, fi.fanout[0xff])
|
||||
for i := 0; i < int(fi.fanout[0xff]); i++ {
|
||||
for i := 0; i < fi.fanout[0xff]; i++ {
|
||||
offset := fi.oidLookupOffset + int64(i)*20
|
||||
if n, err := fi.reader.ReadAt(hashes[i][:], offset); err != nil || n < 20 {
|
||||
return nil
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/memory.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph/memory.go
generated
vendored
@@ -31,7 +31,7 @@ func (mi *MemoryIndex) GetIndexByHash(h plumbing.Hash) (int, error) {
|
||||
// GetCommitDataByIndex gets the commit node from the commit graph using index
|
||||
// obtained from child node, if available
|
||||
func (mi *MemoryIndex) GetCommitDataByIndex(i int) (*CommitData, error) {
|
||||
if int(i) >= len(mi.commitData) {
|
||||
if i >= len(mi.commitData) {
|
||||
return nil, plumbing.ErrObjectNotFound
|
||||
}
|
||||
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/diff/unified_encoder.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/diff/unified_encoder.go
generated
vendored
@@ -94,7 +94,7 @@ func (e *UnifiedEncoder) printMessage(message string) {
|
||||
isEmpty := message == ""
|
||||
hasSuffix := strings.HasSuffix(message, "\n")
|
||||
if !isEmpty && !hasSuffix {
|
||||
message = message + "\n"
|
||||
message += "\n"
|
||||
}
|
||||
|
||||
e.buf.WriteString(message)
|
||||
|
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/idxfile/decoder.go
generated
vendored
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/idxfile/decoder.go
generated
vendored
@@ -110,10 +110,6 @@ func readObjectNames(idx *MemoryIndex, r io.Reader) error {
|
||||
continue
|
||||
}
|
||||
|
||||
if buckets < 0 {
|
||||
return ErrMalformedIdxFile
|
||||
}
|
||||
|
||||
idx.FanoutMapping[k] = len(idx.Names)
|
||||
|
||||
nameLen := int(buckets * objectIDLength)
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/idxfile/writer.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/idxfile/writer.go
generated
vendored
@@ -147,7 +147,7 @@ func (w *Writer) createIndex() (*MemoryIndex, error) {
|
||||
idx.Offset32[bucket] = append(idx.Offset32[bucket], buf.Bytes()...)
|
||||
|
||||
buf.Truncate(0)
|
||||
binary.WriteUint32(buf, uint32(o.CRC32))
|
||||
binary.WriteUint32(buf, o.CRC32)
|
||||
idx.CRC32[bucket] = append(idx.CRC32[bucket], buf.Bytes()...)
|
||||
}
|
||||
|
||||
|
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/index/doc.go
generated
vendored
4
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/index/doc.go
generated
vendored
@@ -320,7 +320,7 @@
|
||||
// == End of Index Entry
|
||||
//
|
||||
// The End of Index Entry (EOIE) is used to locate the end of the variable
|
||||
// length index entries and the begining of the extensions. Code can take
|
||||
// length index entries and the beginning of the extensions. Code can take
|
||||
// advantage of this to quickly locate the index extensions without having
|
||||
// to parse through all of the index entries.
|
||||
//
|
||||
@@ -353,7 +353,7 @@
|
||||
//
|
||||
// - A number of index offset entries each consisting of:
|
||||
//
|
||||
// - 32-bit offset from the begining of the file to the first cache entry
|
||||
// - 32-bit offset from the beginning of the file to the first cache entry
|
||||
// in this block of entries.
|
||||
//
|
||||
// - 32-bit count of cache entries in this blockpackage index
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/index/index.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/format/index/index.go
generated
vendored
@@ -198,7 +198,7 @@ type ResolveUndoEntry struct {
|
||||
}
|
||||
|
||||
// EndOfIndexEntry is the End of Index Entry (EOIE) is used to locate the end of
|
||||
// the variable length index entries and the begining of the extensions. Code
|
||||
// the variable length index entries and the beginning of the extensions. Code
|
||||
// can take advantage of this to quickly locate the index extensions without
|
||||
// having to parse through all of the index entries.
|
||||
//
|
||||
|
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
|
||||
}
|
||||
}
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/advrefs.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/advrefs.go
generated
vendored
@@ -107,7 +107,7 @@ func (a *AdvRefs) resolveHead(s storer.ReferenceStorer) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
ref, err := s.Reference(plumbing.ReferenceName(plumbing.Master))
|
||||
ref, err := s.Reference(plumbing.Master)
|
||||
|
||||
// check first if HEAD is pointing to master
|
||||
if err == nil {
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/updreq_decode.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/updreq_decode.go
generated
vendored
@@ -225,7 +225,7 @@ func parseCommand(b []byte) (*Command, error) {
|
||||
return nil, errInvalidNewObjId(err)
|
||||
}
|
||||
|
||||
return &Command{Old: oh, New: nh, Name: plumbing.ReferenceName(n)}, nil
|
||||
return &Command{Old: oh, New: nh, Name: n}, nil
|
||||
}
|
||||
|
||||
func parseHash(s string) (plumbing.Hash, error) {
|
||||
|
8
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/http/common.go
generated
vendored
8
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/http/common.go
generated
vendored
@@ -139,7 +139,7 @@ func (s *session) ApplyAuthToRequest(req *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
s.auth.setAuth(req)
|
||||
s.auth.SetAuth(req)
|
||||
}
|
||||
|
||||
func (s *session) ModifyEndpointIfRedirect(res *http.Response) {
|
||||
@@ -175,7 +175,7 @@ func (*session) Close() error {
|
||||
// AuthMethod is concrete implementation of common.AuthMethod for HTTP services
|
||||
type AuthMethod interface {
|
||||
transport.AuthMethod
|
||||
setAuth(r *http.Request)
|
||||
SetAuth(r *http.Request)
|
||||
}
|
||||
|
||||
func basicAuthFromEndpoint(ep *transport.Endpoint) *BasicAuth {
|
||||
@@ -192,7 +192,7 @@ type BasicAuth struct {
|
||||
Username, Password string
|
||||
}
|
||||
|
||||
func (a *BasicAuth) setAuth(r *http.Request) {
|
||||
func (a *BasicAuth) SetAuth(r *http.Request) {
|
||||
if a == nil {
|
||||
return
|
||||
}
|
||||
@@ -226,7 +226,7 @@ type TokenAuth struct {
|
||||
Token string
|
||||
}
|
||||
|
||||
func (a *TokenAuth) setAuth(r *http.Request) {
|
||||
func (a *TokenAuth) SetAuth(r *http.Request) {
|
||||
if a == nil {
|
||||
return
|
||||
}
|
||||
|
5
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/server/server.go
generated
vendored
5
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/server/server.go
generated
vendored
@@ -286,11 +286,6 @@ func (s *rpSession) updateReferences(req *packp.ReferenceUpdateRequest) {
|
||||
continue
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
s.setStatus(cmd.Name, err)
|
||||
continue
|
||||
}
|
||||
|
||||
ref := plumbing.NewHashReference(cmd.Name, cmd.New)
|
||||
err := s.storer.SetReference(ref)
|
||||
s.setStatus(cmd.Name, err)
|
||||
|
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/ssh/auth_method.go
generated
vendored
2
vendor/gopkg.in/src-d/go-git.v4/plumbing/transport/ssh/auth_method.go
generated
vendored
@@ -61,7 +61,7 @@ func (a *KeyboardInteractive) ClientConfig() (*ssh.ClientConfig, error) {
|
||||
return a.SetHostKeyCallback(&ssh.ClientConfig{
|
||||
User: a.User,
|
||||
Auth: []ssh.AuthMethod{
|
||||
ssh.KeyboardInteractiveChallenge(a.Challenge),
|
||||
a.Challenge,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user