[PATCH v2 8/8] t5703: feed raw data into test-tool unpack-sideband
- From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
- Date
- Mar 22, 2020, 00:55 UTC
- Message-ID
- <d4507d381e739667f9059fe2b512fb251a74c500.1584838148.git.congdanhqx@gmail.com>
- In-Reply-To
- <cover.1584838148.git.congdanhqx@gmail.com>
busybox's sed isn't binary clean. Thus, triggers false-negative on this test.
We could replace sed with perl on this usecase. But, we could slightly modify the helper to discard unwanted data in the beginning.
Fix the false negative by updating this helper.
Helped-by: Jeff King <peff@peff.net> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- t/helper/test-pkt-line.c | 2 +- t/t5703-upload-pack-ref-in-want.sh | 5 +---- 2 files changed, 2 insertions(+), 5 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); diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index 7fba3063bf..a34460f7d8 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -13,10 +13,7 @@ get_actual_refs () { } get_actual_commits () { - sed -n -e '/packfile/,/0000/{ - /packfile/d - p - }' <out | test-tool pkt-line unpack-sideband >o.pack && + test-tool pkt-line unpack-sideband <out >o.pack && git index-pack o.pack && git verify-pack -v o.idx >objs && grep commit objs | cut -d" " -f1 | sort >actual_commits
-- 2.26.0.rc2.310.g2932bb562d