global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jx/sideband-chomp-newline-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2024-01-12 16:09:56 -08:00
parent 0fea6b73f1 7033d5479b
commit 15df15fe07
4 changed files with 147 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkt-line.h
View File

@@ -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;
};
/*