diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:37 +0300 |
| commit | 6b9f5096eb034cc59a0a71b86ae65eb9433c8ea8 (patch) | |
| tree | bde79de138bb1039dda0b27b360969114b3610c5 /sideband.c | |
| parent | e2850a27a95c6f5b141dd88398b1702d2e524a81 (diff) | |
| parent | 712b0377db60e0d3ac8bf3332022dfcd01e29afa (diff) | |
Merge branch 'js/avoid-split-sideband-message'
The side-band status report can be sent at the same time as the
primary payload multiplexed, but the demultiplexer on the receiving
end incorrectly split a single status report into two, which has
been corrected.
* js/avoid-split-sideband-message:
test-pkt-line: drop colon from sideband identity
sideband: report unhandled incomplete sideband messages as bugs
sideband: avoid reporting incomplete sideband messages
Diffstat (limited to 'sideband.c')
| -rw-r--r-- | sideband.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sideband.c b/sideband.c index 0a60662fa6..a5405b9aaa 100644 --- a/sideband.c +++ b/sideband.c @@ -190,7 +190,7 @@ int demultiplex_sideband(const char *me, char *buf, int len, return 0; case 1: *sideband_type = SIDEBAND_PRIMARY; - break; + return 1; default: strbuf_addf(scratch, "%s%s: protocol error: bad band #%d", scratch->len ? "\n" : "", me, band); |