Merge branch 'js/rebase-i-progress-tidy'

diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 3683df13a6ae2208212bd3606187f9876e0562b5..d6981ba304b0b1f2da22d8ec14d4b472b54f3415 100755 (executable)
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -75,7 +75,7 @@ test_expect_success TTY 'progress messages go to tty' '
        ensure_fresh_upstream &&
 
        test_terminal git push -u upstream master >out 2>err &&
-       grep "Writing objects" err
+       test_i18ngrep "Writing objects" err
 '
 
 test_expect_success 'progress messages do not go to non-tty' '
@@ -83,7 +83,7 @@ test_expect_success 'progress messages do not go to non-tty' '
 
        # skip progress messages, since stderr is non-tty
        git push -u upstream master >out 2>err &&
-       ! grep "Writing objects" err
+       test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success 'progress messages go to non-tty (forced)' '
@@ -91,22 +91,22 @@ test_expect_success 'progress messages go to non-tty (forced)' '
 
        # force progress messages to stderr, even though it is non-tty
        git push -u --progress upstream master >out 2>err &&
-       grep "Writing objects" err
+       test_i18ngrep "Writing objects" err
 '
 
 test_expect_success TTY 'push -q suppresses progress' '
        ensure_fresh_upstream &&
 
        test_terminal git push -u -q upstream master >out 2>err &&
-       ! grep "Writing objects" err
+       test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'push --no-progress suppresses progress' '
        ensure_fresh_upstream &&
 
        test_terminal git push -u --no-progress upstream master >out 2>err &&
-       ! grep "Unpacking objects" err &&
-       ! grep "Writing objects" err
+       test_i18ngrep ! "Unpacking objects" err &&
+       test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'quiet push' '