Fix Rebase

go/pkg/reader/reader.go

@@ -146,21 +146,22 @@ func (cfs *compressedSeeker) Read(p []byte) (int, error) {
 		// errW must be non-nil if written bytes != from n.
 		_, errW = cfs.encd.Write(p[:n])
 	}
-	m, err := cfs.buf.Read(p)
+	m, errR2 := cfs.buf.Read(p)
 
 	var retErr error
-	if errR == io.EOF {
-		cfs.encd.Close()
-	} else if errR != nil {
+	if errR != nil {
 		retErr = errR
-	}
-	if retErr == nil && errW != nil {
+	} else if errW != nil {
 		retErr = errW
+	} else {
+		retErr = errR2
 	}
-	if retErr == nil {
-		retErr = err
+
+	if retErr != nil {
+		cfs.encd.Close()
 	}
-	return m, err
+
+	return m, retErr
 }
 
 func (cfs *compressedSeeker) SeekOffset(offset int64) error {
@@ -179,3 +180,6 @@ func (cfs *compressedSeeker) SeekOffset(offset int64) error {
 
 func (cfs *compressedSeeker) IsInitialized() bool { return cfs.fs.IsInitialized() }
 func (cfs *compressedSeeker) Initialize() error   { return cfs.fs.Initialize() }
+
+// The compressor is already closed on EOF on Read.
+func (cfs *compressedSeeker) Close() error { return cfs.fs.Initialize() }

go/pkg/reader/reader_test.go

@@ -141,7 +141,7 @@ func TestCompressedReader(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			path, err := test_util.CreateFile(t, false, blob)
+			path, err := testutil.CreateFile(t, false, blob)
 			if err != nil {
 				t.Fatalf("Failed to initialize temp file: %v", err)
 			}