go-git · bored-engineer · Jan 2, 2025
diff --git a/plumbing/format/pktline/encoder.go b/plumbing/format/pktline/encoder.go
@@ -31,6 +31,10 @@ var (
 	Flush = []byte{}
 	// FlushString is the payload to use with the EncodeString method to encode a flush-pkt.
 	FlushString = ""
+	// DelimPkt is the contents of a delim-pkt pkt-line.
+	DelimPkt = []byte{'0', '0', '0', '1'}
+	// ResponseEndPkt is the contents of a response-end-pkt pkt-line.
+	ResponseEndPkt = []byte{'0', '0', '0', '2'}
 	// ErrPayloadTooLong is returned by the Encode methods when any of the
 	// provided payloads is bigger than MaxPayloadSize.
 	ErrPayloadTooLong = errors.New("payload is too long")
@@ -50,6 +54,20 @@ func (e *Encoder) Flush() error {
 	return err
 }
 
+// Delim encodes a delim-pkt to the output stream.
+func (e *Encoder) Delim() error {
+	defer trace.Packet.Print("packet: > 0001")
+	_, err := e.w.Write(DelimPkt)
+	return err
+}
+
+// ResponseEnd encodes a response-end-pkt to the output stream.
+func (e *Encoder) ResponseEnd() error {
+	defer trace.Packet.Print("packet: > 0002")
+	_, err := e.w.Write(ResponseEndPkt)
+	return err
+}
+
 // Encode encodes a pkt-line with the payload specified and write it to
 // the output stream.  If several payloads are specified, each of them
 // will get streamed in their own pkt-lines.

diff --git a/plumbing/format/pktline/scanner.go b/plumbing/format/pktline/scanner.go
@@ -23,7 +23,9 @@ var ErrInvalidPktLen = errors.New("invalid pkt-len found")
 //
 // After each Scan call, the Bytes method will return the payload of the
 // corresponding pkt-line on a shared buffer, which will be 65516 bytes
-// or smaller.  Flush pkt-lines are represented by empty byte slices.
+// or smaller.  Flush, Delim and ResponseEnd pkt-lines are represented
+// by an empty byte slice. The specific pkt-type can be deteremined via
+// the FlushPkt, DelimPkt or ResponseEndPkt method.
 //
 // Scanning stops at EOF or the first I/O error.
 type Scanner struct {
@@ -81,6 +83,21 @@ func (s *Scanner) Scan() bool {
 	return true
 }
 
+// FlushPkt returns true if the packet as a FlushPkt
+func (s *Scanner) FlushPkt() bool {
+	return s.len == [lenSize]byte{'0', '0', '0', '0'}
+}
+
+// DelimPkt returns true if the packet as a DelimPkt
+func (s *Scanner) DelimPkt() bool {
+	return s.len == [lenSize]byte{'0', '0', '0', '1'}
+}
+
+// ResponseEndPkt returns true if the packet as a ResponseEndPkt
+func (s *Scanner) ResponseEndPkt() bool {
+	return s.len == [lenSize]byte{'0', '0', '0', '2'}
+}
+
 // Bytes returns the most recent payload generated by a call to Scan.
 // The underlying array may point to data that will be overwritten by a
 // subsequent call to Scan. It does no allocation.
@@ -108,7 +125,7 @@ func (s *Scanner) readPayloadLen() (int, error) {
 	case n == 0:
 		return 0, nil
 	case n <= lenSize:
-		return 0, ErrInvalidPktLen
+		return 0, nil
 	case n > OversizePayloadMax+lenSize:
 		return 0, ErrInvalidPktLen
 	default: