aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/compress/zlib/reader.go1
-rw-r--r--internal/compress/zlib/reader_reset.go6
-rw-r--r--internal/testgit/repo_pack_objects_is_thin.go2
3 files changed, 9 insertions, 0 deletions
diff --git a/internal/compress/zlib/reader.go b/internal/compress/zlib/reader.go
index 75ef864c..a6497dec 100644
--- a/internal/compress/zlib/reader.go
+++ b/internal/compress/zlib/reader.go
@@ -132,6 +132,7 @@ func (z *Reader) Read(p []byte) (int, error) {
// Finished file; check checksum.
readN, err := io.ReadFull(z.r, z.scratch[0:4])
z.trailerRead += uint64(readN)
+
if err != nil {
if errors.Is(err, io.EOF) {
err = io.ErrUnexpectedEOF
diff --git a/internal/compress/zlib/reader_reset.go b/internal/compress/zlib/reader_reset.go
index 19f06cf0..32af0b49 100644
--- a/internal/compress/zlib/reader_reset.go
+++ b/internal/compress/zlib/reader_reset.go
@@ -30,6 +30,7 @@ func (z *Reader) reset(r io.Reader, dict []byte) error {
// Read the header (RFC 1950 section 2.2.).
readN, err := io.ReadFull(z.r, z.scratch[0:2])
z.headerRead += uint64(readN)
+
z.err = err
if z.err != nil {
if errors.Is(z.err, io.EOF) {
@@ -49,6 +50,7 @@ func (z *Reader) reset(r io.Reader, dict []byte) error {
haveDict := z.scratch[1]&0x20 != 0
if haveDict {
readN, z.err = io.ReadFull(z.r, z.scratch[0:4])
+
z.headerRead += uint64(readN)
if z.err != nil {
if errors.Is(z.err, io.EOF) {
@@ -76,10 +78,12 @@ func (z *Reader) reset(r io.Reader, dict []byte) error {
if z.err != nil {
return z.err
}
+
progress, ok := z.decompressor.(flate.InputProgress)
if !ok {
panic("zlib: pooled decompressor does not implement flate.InputProgress")
}
+
z.progress = progress
z.digest = adler32.New()
@@ -92,10 +96,12 @@ func (z *Reader) reset(r io.Reader, dict []byte) error {
} else {
z.decompressor = flate.NewReader(z.r)
}
+
progress, ok := z.decompressor.(flate.InputProgress)
if !ok {
panic("zlib: decompressor does not implement flate.InputProgress")
}
+
z.progress = progress
z.digest = adler32.New()
diff --git a/internal/testgit/repo_pack_objects_is_thin.go b/internal/testgit/repo_pack_objects_is_thin.go
index afc704d1..c37b6d27 100644
--- a/internal/testgit/repo_pack_objects_is_thin.go
+++ b/internal/testgit/repo_pack_objects_is_thin.go
@@ -48,6 +48,7 @@ func (testRepo *TestRepo) PackObjectsIsThin(tb testing.TB, revs []string) bool {
if err != nil {
_ = indexCmd.Process.Kill()
_ = indexCmd.Wait()
+
tb.Fatalf("git %v start failed: %v", packArgs, err)
}
@@ -65,6 +66,7 @@ func (testRepo *TestRepo) PackObjectsIsThin(tb testing.TB, revs []string) bool {
if strings.Contains(stderr, "unresolved") && strings.Contains(stderr, "delta") {
return true
}
+
if strings.Contains(stderr, "missing") && strings.Contains(stderr, "base") {
return true
}