diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:49:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:49:55 -0700 |
| commit | 28ba5a7b27b8a16e44b760196fb09a016c6713d6 (patch) | |
| tree | 50d749cb923379d29c1dff142bc921203e008ea3 /t/helper | |
| parent | The third batch (diff) | |
| parent | t5703: feed raw data into test-tool unpack-sideband (diff) | |
| download | tgif-28ba5a7b27b8a16e44b760196fb09a016c6713d6.tar.xz | |
Merge branch 'dd/test-with-busybox'
Various tests have been updated to work around issues found with
shell utilities that come with busybox etc.
* dd/test-with-busybox:
t5703: feed raw data into test-tool unpack-sideband
t4124: tweak test so that non-compliant diff(1) can also be used
t7063: drop non-POSIX argument "-ls" from find(1)
t5616: use rev-parse instead to get HEAD's object_id
t5003: skip conversion test if unzip -a is unavailable
t5003: drop the subshell in test_lazy_prereq
test-lib-functions: test_cmp: eval $GIT_TEST_CMP
t4061: use POSIX compliant regex(7)
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-pkt-line.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c index 282d536384..12ca698e17 100644 --- a/t/helper/test-pkt-line.c +++ b/t/helper/test-pkt-line.c @@ -67,7 +67,7 @@ static void unpack_sideband(void) case PACKET_READ_NORMAL: band = reader.line[0] & 0xff; if (band < 1 || band > 2) - die("unexpected side band %d", band); + continue; /* skip non-sideband packets */ fd = band; write_or_die(fd, reader.line + 1, reader.pktlen - 1); |