aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2007-04-04 15:39:05 -0400
committerJunio C Hamano <junkio@cox.net>2007-04-04 13:11:33 -0700
commit364b8523529163ffeeb71521239a18ac1f550512 (patch)
treecf4c9d591b4b43c33e0e4ef0ab3ea982a42460fd
parent89815cab95268e8f0f58142b848ac4cd5e9cbdcb (diff)
downloadgit-364b8523529163ffeeb71521239a18ac1f550512.tar.gz
git-364b8523529163ffeeb71521239a18ac1f550512.tar.xz
Fix t4200-rerere for white-space from "wc -l"
On OS X, wc outputs 6 spaces before the number of lines, so the test expecting the string "10" failed. Do not quote $cmd to strip away the problematic whitespace as other tests do. Also fix the grammar of the test name while making changes to it. There's only one preimage, so it's "has", not "have". Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t4200-rerere.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 8b611bbea..bc878d750 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -50,10 +50,10 @@ test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
test_expect_success 'no postimage or thisimage yet' \
"test ! -f $rr/postimage -a ! -f $rr/thisimage"
-test_expect_success 'preimage have right number of lines' '
+test_expect_success 'preimage has right number of lines' '
cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
- test "$cnt" = 10
+ test $cnt = 10
'