From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:37 +0000 (-0800)
Subject: Merge branch 'js/avoid-split-sideband-message'
X-Git-Tag: v2.30.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b9f5096eb034cc59a0a71b86ae65eb9433c8ea8;p=thirdparty%2Fgit.git

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
---

6b9f5096eb034cc59a0a71b86ae65eb9433c8ea8