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/packfile/encoder.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/packfile/encoder.go')
| -rw-r--r-- | plumbing/format/packfile/encoder.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/plumbing/format/packfile/encoder.go b/plumbing/format/packfile/encoder.go index 5501f88..804f5a8 100644 --- a/plumbing/format/packfile/encoder.go +++ b/plumbing/format/packfile/encoder.go @@ -2,11 +2,11 @@ package packfile import ( "compress/zlib" - "crypto/sha1" "fmt" "io" "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/hash" "github.com/go-git/go-git/v5/plumbing/storer" "github.com/go-git/go-git/v5/utils/binary" "github.com/go-git/go-git/v5/utils/ioutil" @@ -28,7 +28,7 @@ type Encoder struct { // OFSDeltaObject. To use Reference deltas, set useRefDeltas to true. func NewEncoder(w io.Writer, s storer.EncodedObjectStorer, useRefDeltas bool) *Encoder { h := plumbing.Hasher{ - Hash: sha1.New(), + Hash: hash.New(hash.CryptoType), } mw := io.MultiWriter(w, h) ow := newOffsetWriter(mw) @@ -131,11 +131,7 @@ func (e *Encoder) entry(o *ObjectToPack) (err error) { defer ioutil.CheckClose(or, &err) _, err = io.Copy(e.zw, or) - if err != nil { - return err - } - - return nil + return err } func (e *Encoder) writeBaseIfDelta(o *ObjectToPack) error { |