Re: [PATCH] bundle: fix wrong check of read_header()'s return value & add tests
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] bundle: fix wrong check of read_header()'s return value & add tests · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] bundle: fix wrong check of read_header()'s return value & add tests · Johannes Schindelin <hidden>
Johannes Schindelin [off-list ref] writes:
quoted hunk
I fear this would suffer the same fate as t8001, namely that some sed would add a newline, which is plain wrong here. This is a workaround:diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index ce96b4b..f895072 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh@@ -110,7 +110,7 @@ test_expect_failure 'unbundle 1' ' test_expect_success 'bundle 1 has only 3 files ' ' cd "$D" && - sed "1,4d" < bundle1 > bundle.pack && + dd bs=136 skip=1 if=bundle1 of=bundle.pack &&
We might want to reword or enhance the headers later, and 136 is a horrible workaround. Would this work?
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index ce96b4b..ad589dd 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh@@ -110,9 +110,16 @@ test_expect_failure 'unbundle 1' ' test_expect_success 'bundle 1 has only 3 files ' ' cd "$D" && - sed "1,4d" < bundle1 > bundle.pack && + ( + while read x && test -n "$x" + do + :; + done + cat + ) <bundle1 >bundle.pack && git index-pack bundle.pack && - test 4 = $(git verify-pack -v bundle.pack | wc -l) + verify=$(git verify-pack -v bundle.pack) && + test 4 = $(echo "$verify" | wc -l) ' test_expect_success 'unbundle 2' '