Merge branch 'jk/ident-ai-canonname-could-be-null' into maint

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index dd2e6ce34e7dff0e59e917fd4e3aefa01181778c..8198d8eb05c5366c7d61a12351c333902a2265b6 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1182,7 +1182,7 @@ test_expect_success 'extra args: setup' '
 test_extra_arg () {
        test_expect_success "extra args: $*" "
                test_must_fail git remote $* bogus_extra_arg 2>actual &&
-               grep '^usage:' actual
+               test_i18ngrep '^usage:' actual
        "
 }