Merge branch 'ps/ref-tests-update'

[thirdparty/git.git] / t / t1400-update-ref.sh

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 70a760ba378dce237f51732cafe930bafa9a6246..6d1810c358ffaf9c592befe946183ce3a70f04a4 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -413,7 +413,7 @@ test_expect_success 'Query "main@{2005-05-26 23:33:01}" (middle of history with
        git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
        echo "$B" >expect &&
        test_cmp expect o &&
-       test_i18ngrep -F "warning: log for ref $m has gap after $gd" e
+       test_grep -F "warning: log for ref $m has gap after $gd" e
 '
 test_expect_success 'Query "main@{2005-05-26 23:38:00}" (middle of history)' '
        test_when_finished "rm -f o e" &&
@@ -434,7 +434,7 @@ test_expect_success 'Query "main@{2005-05-28}" (past end of history)' '
        git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
        echo "$D" >expect &&
        test_cmp expect o &&
-       test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e
+       test_grep -F "warning: log for ref $m unexpectedly ended on $ld" e
 '
 
 rm -f expect
@@ -490,7 +490,7 @@ test_expect_success 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)'
 test_expect_success 'given old value for missing pseudoref, do not create' '
        test_must_fail git update-ref PSEUDOREF $A $B 2>err &&
        test_must_fail git rev-parse PSEUDOREF &&
-       test_i18ngrep "unable to resolve reference" err
+       test_grep "unable to resolve reference" err
 '
 
 test_expect_success 'create pseudoref' '
@@ -511,7 +511,7 @@ test_expect_success 'overwrite pseudoref with correct old value' '
 test_expect_success 'do not overwrite pseudoref with wrong old value' '
        test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
        test $C = $(git rev-parse PSEUDOREF) &&
-       test_i18ngrep "cannot lock ref.*expected" err
+       test_grep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref' '
@@ -523,7 +523,7 @@ test_expect_success 'do not delete pseudoref with wrong old value' '
        git update-ref PSEUDOREF $A &&
        test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
        test $A = $(git rev-parse PSEUDOREF) &&
-       test_i18ngrep "cannot lock ref.*expected" err
+       test_grep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref with correct old value' '
@@ -540,7 +540,7 @@ test_expect_success 'do not overwrite pseudoref with old OID zero' '
        test_when_finished git update-ref -d PSEUDOREF &&
        test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
        test $A = $(git rev-parse PSEUDOREF) &&
-       test_i18ngrep "already exists" err
+       test_grep "already exists" err
 '
 
 # Test --stdin
@@ -560,7 +560,7 @@ test_expect_success 'stdin test setup' '
 
 test_expect_success '-z fails without --stdin' '
        test_must_fail git update-ref -z $m $m $m 2>err &&
-       test_i18ngrep "usage: git update-ref" err
+       test_grep "usage: git update-ref" err
 '
 
 test_expect_success 'stdin works with no input' '
@@ -678,7 +678,7 @@ test_expect_success 'stdin fails with duplicate refs' '
        create $a $m
        EOF
        test_must_fail git update-ref --stdin <stdin 2>err &&
-       test_i18ngrep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
+       test_grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
 '
 
 test_expect_success 'stdin create ref works' '
@@ -1111,7 +1111,7 @@ test_expect_success 'stdin -z fails option with unknown name' '
 test_expect_success 'stdin -z fails with duplicate refs' '
        printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
-       test_i18ngrep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
+       test_grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
 '
 
 test_expect_success 'stdin -z create ref works' '
@@ -1342,7 +1342,7 @@ test_expect_success 'fails with duplicate HEAD update' '
        update HEAD $B
        EOF
        test_must_fail git update-ref --stdin <stdin 2>err &&
-       test_i18ngrep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
+       test_grep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
        echo "refs/heads/target1" >expect &&
        git symbolic-ref HEAD >actual &&
        test_cmp expect actual &&
@@ -1359,7 +1359,7 @@ test_expect_success 'fails with duplicate ref update via symref' '
        update refs/heads/symref2 $B
        EOF
        test_must_fail git update-ref --stdin <stdin 2>err &&
-       test_i18ngrep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
+       test_grep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
        echo "refs/heads/target2" >expect &&
        git symbolic-ref refs/heads/symref2 >actual &&
        test_cmp expect actual &&