diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2012-03-01 21:40:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 22:25:57 (GMT) |
| commit | 61821aaa12ed698f2e94bb15fea958c598e4f231 (patch) | |
| tree | dd00d31fe608a863a7ea4af025dc359e7bc95184 /t/t5510-fetch.sh | |
| parent | 8a557bb77fc009b00f7952f0d3d6ebd33079f70e (diff) | |
| download | git-61821aaa12ed698f2e94bb15fea958c598e4f231.zip git-61821aaa12ed698f2e94bb15fea958c598e4f231.tar.gz git-61821aaa12ed698f2e94bb15fea958c598e4f231.tar.bz2 | |
t5510: refactor bundle->pack conversion
It's not so much a conversion as a "strip everything up to and
including the first blank line", but it will come in handy again.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5510-fetch.sh')
| -rwxr-xr-x | t/t5510-fetch.sh | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index e0af4c4..6508d8a 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -14,6 +14,14 @@ test_bundle_object_count () { test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l) } +convert_bundle_to_pack () { + while read x && test -n "$x" + do + :; + done + cat +} + test_expect_success setup ' echo >file original && git add file && @@ -207,13 +215,7 @@ test_expect_success 'unbundle 1' ' test_expect_success 'bundle 1 has only 3 files ' ' cd "$D" && - ( - while read x && test -n "$x" - do - :; - done - cat - ) <bundle1 >bundle.pack && + convert_bundle_to_pack <bundle1 >bundle.pack && git index-pack bundle.pack && test_bundle_object_count bundle.pack 3 ' @@ -230,13 +232,7 @@ test_expect_success 'bundle does not prerequisite objects' ' git add file2 && git commit -m add.file2 file2 && git bundle create bundle3 -1 HEAD && - ( - while read x && test -n "$x" - do - :; - done - cat - ) <bundle3 >bundle.pack && + convert_bundle_to_pack <bundle3 >bundle.pack && git index-pack bundle.pack && test_bundle_object_count bundle.pack 3 ' |