[PATCH 21/21] t1050, t5500: replace the use of "show-index|wc -l" with verify-pack
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:58:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- t/t1050-large.sh | 9 +++++---- t/t5500-fetch-pack.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index fd10528..829030b 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh@@ -32,7 +32,7 @@ test_expect_success 'add a large file or two' ' done && test -z "$bad" && test $count = 1 && - cnt=$(git show-index <"$idx" | wc -l) && + cnt=$(git verify-pack -v "${idx/idx/pack}" | grep "^[0-9a-f]\{40\}" | wc -l) && test $cnt = 2 && for l in .git/objects/??/?????????????????????????????????????? do
@@ -93,11 +93,12 @@ test_expect_success 'packsize limit' ' ) | sort >expect && - for pi in .git/objects/pack/pack-*.idx + for pi in .git/objects/pack/pack-*.pack do - git show-index <"$pi" + git verify-pack -v "$pi" done | - sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" | + grep "^[0-9a-f]\{40\}" | + sed -e "s/^\([0-9a-f]\{40\}\) .*/\1/" | sort >actual && test_cmp expect actual
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index fd2598e..f99cd14 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh@@ -60,8 +60,8 @@ pull_to_client () { git unpack-objects <$p && git fsck --full && - idx=`echo pack-*.idx` && - pack_count=`git show-index <$idx | wc -l` && + pack=`echo pack-*.pack` && + pack_count=`git verify-pack -v $pack | grep "^[0-9a-f]\{40\}" | wc -l` && test $pack_count = $count && rm -f pack-* )
--
1.8.2.82.gc24b958