From: Junio C Hamano Date: Sun, 12 Feb 2006 07:08:23 +0000 (-0800) Subject: t5500: adjust to change in pack-object reporting behaviour. X-Git-Tag: v1.2.0~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16139f9035137ccd81e1e9a9dc203fbede6997a0;p=git.git t5500: adjust to change in pack-object reporting behaviour. Now pack-object is not as chatty when its stderr is not connected to a terminal, so the test needs to be adjusted for that. Signed-off-by: Junio C Hamano --- diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 0781bd287..e15e14fc3 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -76,7 +76,7 @@ function pull_to_client () { git-symbolic-ref HEAD refs/heads/${heads:0:1} test_expect_success "fsck" 'git-fsck-objects --full > fsck.txt 2>&1' test_expect_object_count "after $number pull" $count - pack_count=$(grep Packing log.txt|tr -dc "0-9") + pack_count=$(grep Unpacking log.txt|tr -dc "0-9") test -z "$pack_count" && pack_count=0 if [ -z "$no_strict_count_check" ]; then test_expect_success "minimal count" "test $count = $pack_count"