diff options
| author | Paulo Gomes <pjbgf@linux.com> | 2023-08-05 10:20:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 10:20:38 +0100 |
| commit | e6f68d2e4cd1bc4447126816c7c27e1fc2098e30 (patch) | |
| tree | 15c5e333b93641f9eadcb4bf4b34c338135f7a23 /plumbing/format/index/decoder.go | |
| parent | 5882d60fb7ccd4cfc0fe69286aa96e198c9d1eb0 (diff) | |
| parent | 4ec6b3f4fa9cdfe8f10d0953ac7d398d01a90f17 (diff) | |
| download | go-git-e6f68d2e4cd1bc4447126816c7c27e1fc2098e30.tar.gz | |
Merge branch 'master' into jc/commit-ammend
Diffstat (limited to 'plumbing/format/index/decoder.go')
| -rw-r--r-- | plumbing/format/index/decoder.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plumbing/format/index/decoder.go b/plumbing/format/index/decoder.go index 036b636..6778cf7 100644 --- a/plumbing/format/index/decoder.go +++ b/plumbing/format/index/decoder.go @@ -3,15 +3,14 @@ package index import ( "bufio" "bytes" - "crypto/sha1" "errors" - "hash" "io" - "io/ioutil" + "strconv" "time" "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/hash" "github.com/go-git/go-git/v5/utils/binary" ) @@ -49,7 +48,7 @@ type Decoder struct { // NewDecoder returns a new decoder that reads from r. func NewDecoder(r io.Reader) *Decoder { - h := sha1.New() + h := hash.New(hash.CryptoType) return &Decoder{ r: io.TeeReader(r, h), hash: h, @@ -202,7 +201,7 @@ func (d *Decoder) padEntry(idx *Index, e *Entry, read int) error { entrySize := read + len(e.Name) padLen := 8 - entrySize%8 - _, err := io.CopyN(ioutil.Discard, d.r, int64(padLen)) + _, err := io.CopyN(io.Discard, d.r, int64(padLen)) return err } |