diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-13 03:09:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-13 03:09:56 +0300 |
| commit | 15df15fe07ef66b51302bb77e393f3c5502629de (patch) | |
| tree | b7e3119769b730bff3351fc17e16ff46df022700 /pkt-line.h | |
| parent | 0fea6b73f1771469cc423288fcd754d374865400 (diff) | |
| parent | 7033d5479b8a7b8e7c33892f23d106c33c938ff4 (diff) | |
Merge branch 'jx/sideband-chomp-newline-fix'
Sideband demultiplexer fixes.
* jx/sideband-chomp-newline-fix:
pkt-line: do not chomp newlines for sideband messages
pkt-line: memorize sideband fragment in reader
test-pkt-line: add option parser for unpack-sideband
Diffstat (limited to 'pkt-line.h')
| -rw-r--r-- | pkt-line.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkt-line.h b/pkt-line.h index aedef56286..3b33cc64f3 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -84,6 +84,7 @@ void packet_fflush(FILE *f); #define PACKET_READ_DIE_ON_ERR_PACKET (1u<<2) #define PACKET_READ_GENTLE_ON_READ_ERROR (1u<<3) #define PACKET_READ_REDACT_URI_PATH (1u<<4) +#define PACKET_READ_USE_SIDEBAND (1u<<5) int packet_read(int fd, char *buffer, unsigned size, int options); /* @@ -193,6 +194,9 @@ struct packet_reader { /* hash algorithm in use */ const struct git_hash_algo *hash_algo; + + /* hold temporary sideband message */ + struct strbuf scratch; }; /* |