t/t{3600,3800,5401}: do not use egrep when grep would do

There is nothing _wrong_ with egrep per se, but this way we
would have less dependency on external tools.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5c001aa4897a02098904f2c492b23690a9e1f6ab..b1ee622ef7887407c93bc55d95827f9eb7a2b951 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -127,7 +127,7 @@ test_expect_success '"rm" command printed' '
        git add test-file &&
        git commit -m "add file for rm test" &&
        git rm test-file > rm-output &&
        git add test-file &&
        git commit -m "add file for rm test" &&
        git rm test-file > rm-output &&

-       test `egrep "^rm " rm-output | wc -l` = 1 &&
+       test `grep "^rm " rm-output | wc -l` = 1 &&

        rm -f test-file rm-output &&
        git commit -m "remove file from rm test"
 '
        rm -f test-file rm-output &&
        git commit -m "remove file from rm test"
 '

diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 261f199a0cb32864bbb3cf103ddd2a63e62d2590..e5f3073f88059aa0b9921aeee9438efa38b4bf17 100755 (executable)
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -15,7 +15,7 @@ check_verify_failure () {
     test_expect_success \
         "$1" \
         'git-mktag <tag.sig 2>message ||
     test_expect_success \
         "$1" \
         'git-mktag <tag.sig 2>message ||

-         egrep -q -f expect.pat message'
+        grep -q -f expect.pat message'

 }
 
 ###########################################################
 }
 
 ###########################################################

diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index c5dd30d0a43a708722cf4868a83c48290f9b9c9b..3eea3069ebcc20f98bb563af409bb1e15b6e9f54 100755 (executable)
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -129,7 +129,7 @@ STDOUT post-update
 STDERR post-update
 EOF
 test_expect_success 'send-pack stderr contains hook messages' '
 STDERR post-update
 EOF
 test_expect_success 'send-pack stderr contains hook messages' '

-       egrep ^STD send.err >actual &&
+       grep ^STD send.err >actual &&

        git diff - actual <expect
 '
 
        git diff - actual <expect
 '