tests: teach callers of test_i18ngrep to use test_grep

[thirdparty/git.git] / t / t3206-range-diff.sh

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index b5f4d6a653045dafa7c2317036196866f78b9ca5..cfeb8c84b06b320f3a8a1416e285bc69b5e0ddb2 100755 (executable)
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -195,7 +195,7 @@ test_expect_success 'A^! and A^-<n> (unmodified)' '
 
 test_expect_success 'A^{/..} is not mistaken for a range' '
        test_must_fail git range-diff topic^.. topic^{/..} -- 2>error &&
-       test_i18ngrep "not a commit range" error
+       test_grep "not a commit range" error
 '
 
 test_expect_success 'trivial reordering' '
@@ -537,7 +537,7 @@ do
                        main..unmodified >actual &&
                test_when_finished "rm 000?-*" &&
                test_line_count = 5 actual &&
-               test_i18ngrep "^Range-diff:$" 0000-* &&
+               test_grep "^Range-diff:$" 0000-* &&
                grep "= 1: .* s/5/A" 0000-* &&
                grep "= 2: .* s/4/A" 0000-* &&
                grep "= 3: .* s/11/B" 0000-* &&
@@ -549,7 +549,7 @@ test_expect_success 'format-patch --range-diff as commentary' '
        git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
        test_when_finished "rm 0001-*" &&
        test_line_count = 1 actual &&
-       test_i18ngrep "^Range-diff:$" 0001-* &&
+       test_grep "^Range-diff:$" 0001-* &&
        grep "> 1: .* new message" 0001-*
 '
 
@@ -557,7 +557,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a non-integer'
        git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
        test_when_finished "rm v2.9-0001-*" &&
        test_line_count = 1 actual &&
-       test_i18ngrep "^Range-diff:$" v2.9-0001-* &&
+       test_grep "^Range-diff:$" v2.9-0001-* &&
        grep "> 1: .* new message" v2.9-0001-*
 '
 
@@ -565,7 +565,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a integer' '
        git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
        test_when_finished "rm v2-0001-*" &&
        test_line_count = 1 actual &&
-       test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* &&
+       test_grep "^Range-diff ..* v1:$" v2-0001-* &&
        grep "> 1: .* new message" v2-0001-*
 '
 
@@ -573,7 +573,7 @@ test_expect_success 'format-patch --range-diff with v0' '
        git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
        test_when_finished "rm v0-0001-*" &&
        test_line_count = 1 actual &&
-       test_i18ngrep "^Range-diff:$" v0-0001-* &&
+       test_grep "^Range-diff:$" v0-0001-* &&
        grep "> 1: .* new message" v0-0001-*
 '
 
@@ -670,7 +670,7 @@ test_expect_success 'format-patch --range-diff does not compare notes by default
                main..unmodified >actual &&
        test_when_finished "rm 000?-*" &&
        test_line_count = 5 actual &&
-       test_i18ngrep "^Range-diff:$" 0000-* &&
+       test_grep "^Range-diff:$" 0000-* &&
        grep "= 1: .* s/5/A" 0000-* &&
        grep "= 2: .* s/4/A" 0000-* &&
        grep "= 3: .* s/11/B" 0000-* &&
@@ -687,7 +687,7 @@ test_expect_success 'format-patch --range-diff with --no-notes' '
                main..unmodified >actual &&
        test_when_finished "rm 000?-*" &&
        test_line_count = 5 actual &&
-       test_i18ngrep "^Range-diff:$" 0000-* &&
+       test_grep "^Range-diff:$" 0000-* &&
        grep "= 1: .* s/5/A" 0000-* &&
        grep "= 2: .* s/4/A" 0000-* &&
        grep "= 3: .* s/11/B" 0000-* &&
@@ -704,7 +704,7 @@ test_expect_success 'format-patch --range-diff with --notes' '
                main..unmodified >actual &&
        test_when_finished "rm 000?-*" &&
        test_line_count = 5 actual &&
-       test_i18ngrep "^Range-diff:$" 0000-* &&
+       test_grep "^Range-diff:$" 0000-* &&
        grep "= 1: .* s/5/A" 0000-* &&
        grep "= 2: .* s/4/A" 0000-* &&
        grep "= 3: .* s/11/B" 0000-* &&
@@ -733,7 +733,7 @@ test_expect_success 'format-patch --range-diff with format.notes config' '
                main..unmodified >actual &&
        test_when_finished "rm 000?-*" &&
        test_line_count = 5 actual &&
-       test_i18ngrep "^Range-diff:$" 0000-* &&
+       test_grep "^Range-diff:$" 0000-* &&
        grep "= 1: .* s/5/A" 0000-* &&
        grep "= 2: .* s/4/A" 0000-* &&
        grep "= 3: .* s/11/B" 0000-* &&
@@ -764,7 +764,7 @@ test_expect_success 'format-patch --range-diff with multiple notes' '
                main..unmodified >actual &&
        test_when_finished "rm 000?-*" &&
        test_line_count = 5 actual &&
-       test_i18ngrep "^Range-diff:$" 0000-* &&
+       test_grep "^Range-diff:$" 0000-* &&
        grep "= 1: .* s/5/A" 0000-* &&
        grep "= 2: .* s/4/A" 0000-* &&
        grep "= 3: .* s/11/B" 0000-* &&