On Tue, Oct 27, 2020 at 02:52:50AM -0400, Jeff King wrote:
> On Mon, Oct 26, 2020 at 04:09:13PM +0000, Johannes Schindelin via GitGitGadget wrote:
>
> > Changes since v2:
> >
> > * Dropped patch 3/3 because it was only intended to be defensive
> > programming, but turned out to be too hard without layering violations.
>
> It is a bit tricky, but here's a working replacement.
And one other small cleanup, worth doing with or without my patch.
-- >8 --
Subject: [PATCH] test-pkt-line: drop colon from sideband identity
We pass "sideband: " as our identity for errors to recv_sideband(). But
it already adds the trailing colon and space. This doesn't invalidate
any tests, but it looks funny when you examine the test output.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
t/helper/test-pkt-line.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c
index 0bf20642be..5e638f0b97 100644
--- a/t/helper/test-pkt-line.c
+++ b/t/helper/test-pkt-line.c
@@ -100,7 +100,7 @@ static int send_split_sideband(void)
static int receive_sideband(void)
{
- return recv_sideband("sideband: ", 0, 1);
+ return recv_sideband("sideband", 0, 1);
}
int cmd__pkt_line(int argc, const char **argv)
--
2.29.1.634.g9e41dc1bf2
