Merge branch 'jc/test-i18ngrep' into next

Another step to deprecate test_i18ngrep.

* jc/test-i18ngrep:
  tests: teach callers of test_i18ngrep to use test_grep
  test framework: further deprecate test_i18ngrep

contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh

@@ -161,7 +161,7 @@ test_expect_success 'git push properly warns about insufficient permissions' '
  git add foo.forbidden &&
  git commit -m "add a file" &&
  git push 2>actual &&
- test_i18ngrep "foo.forbidden is not a permitted file" actual
+ test_grep "foo.forbidden is not a permitted file" actual
  )
 '
 

t/lib-httpd.sh

@@ -255,7 +255,7 @@ test_http_push_nonff () {
  '
 
  test_expect_success 'non-fast-forward push shows help message' '
- test_i18ngrep "Updates were rejected because" output
+ test_grep "Updates were rejected because" output
  '
 
  test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '

t/lib-submodule-update.sh

@@ -830,7 +830,7 @@ test_submodule_recursing_with_args_common () {
  cd submodule_update &&
  git branch -t invalid_sub1 origin/invalid_sub1 &&
  test_must_fail $command invalid_sub1 2>err &&
- test_i18ngrep sub1 err &&
+ test_grep sub1 err &&
  test_superproject_content origin/add_sub1 &&
  test_submodule_content sub1 origin/add_sub1
  )

t/t0001-init.sh

@@ -168,8 +168,8 @@ test_expect_success 'reinit' '
  git -c init.defaultBranch=initial init >out1 2>err1 &&
  git init >out2 2>err2
  ) &&
- test_i18ngrep "Initialized empty" again/out1 &&
- test_i18ngrep "Reinitialized existing" again/out2 &&
+ test_grep "Initialized empty" again/out1 &&
+ test_grep "Reinitialized existing" again/out2 &&
  test_must_be_empty again/err1 &&
  test_must_be_empty again/err2
 '
@@ -332,15 +332,15 @@ test_expect_success 'init with separate gitdir' '
 
 test_expect_success 'explicit bare & --separate-git-dir incompatible' '
  test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err &&
- test_i18ngrep "cannot be used together" err
+ test_grep "cannot be used together" err
 '
 
 test_expect_success 'implicit bare & --separate-git-dir incompatible' '
  test_when_finished "rm -rf bare.git" &&
  mkdir -p bare.git &&
  test_must_fail env GIT_DIR=. \
  git -C bare.git init --separate-git-dir goop.git 2>err &&
- test_i18ngrep "incompatible" err
+ test_grep "incompatible" err
 '
 
 test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
@@ -349,7 +349,7 @@ test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
  git clone --bare . bare.git &&
  git -C bare.git worktree add --detach ../linkwt &&
  test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err &&
- test_i18ngrep "incompatible" err
+ test_grep "incompatible" err
 '
 
 test_lazy_prereq GETCWD_IGNORES_PERMS '
@@ -563,7 +563,7 @@ test_expect_success '--initial-branch' '
 
  : re-initializing should not change the branch name &&
  git init --initial-branch=ignore initial-branch-option 2>err &&
- test_i18ngrep "ignored --initial-branch" err &&
+ test_grep "ignored --initial-branch" err &&
  git -C initial-branch-option symbolic-ref HEAD >actual &&
  grep hello actual
 '
@@ -579,7 +579,7 @@ test_expect_success 'advice on unconfigured init.defaultBranch' '
  GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
  init unconfigured-default-branch-name 2>err &&
  test_decode_color <err >decoded &&
- test_i18ngrep "<YELLOW>hint: " decoded
+ test_grep "<YELLOW>hint: " decoded
 '
 
 test_expect_success 'overridden default main branch name (env)' '
@@ -592,7 +592,7 @@ test_expect_success 'overridden default main branch name (env)' '
 test_expect_success 'invalid default branch name' '
  test_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME="with space" \
  git init initial-branch-invalid 2>err &&
- test_i18ngrep "invalid branch name" err
+ test_grep "invalid branch name" err
 '
 
 test_expect_success 'branch -m with the initial branch' '

t/t0002-gitfile.sh

@@ -22,13 +22,13 @@ test_expect_success 'initial setup' '
 test_expect_success 'bad setup: invalid .git file format' '
  echo "gitdir $REAL" >.git &&
  test_must_fail git rev-parse 2>.err &&
- test_i18ngrep "invalid gitfile format" .err
+ test_grep "invalid gitfile format" .err
 '
 
 test_expect_success 'bad setup: invalid .git file path' '
  echo "gitdir: $REAL.not" >.git &&
  test_must_fail git rev-parse 2>.err &&
- test_i18ngrep "not a git repository" .err
+ test_grep "not a git repository" .err
 '
 
 test_expect_success 'final setup + check rev-parse --git-dir' '

t/t0003-attributes.sh

@@ -263,7 +263,7 @@ test_expect_success 'root subdir attribute test' '
 test_expect_success 'negative patterns' '
  echo "!f test=bar" >.gitattributes &&
  git check-attr test -- '"'"'!f'"'"' 2>errors &&
- test_i18ngrep "Negative patterns are ignored" errors
+ test_grep "Negative patterns are ignored" errors
 '
 
 test_expect_success 'patterns starting with exclamation' '
@@ -496,7 +496,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
  mkdir subdir &&
  ln -s ../attr subdir/.gitattributes &&
  attr_check_basic subdir/file unspecified &&
- test_i18ngrep "unable to access.*gitattributes" err
+ test_grep "unable to access.*gitattributes" err
 '
 
 test_expect_success 'large attributes line ignored in tree' '

t/t0008-ignores.sh

@@ -49,7 +49,7 @@ broken_c_unquote_verbose () {
 
 stderr_contains () {
  regexp="$1"
- if test_i18ngrep "$regexp" "$HOME/stderr"
+ if test_grep "$regexp" "$HOME/stderr"
  then
  return 0
  else
@@ -942,7 +942,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
  ln -s ignore subdir/.gitignore &&
  test_must_fail git check-ignore subdir/file >actual 2>err &&
  test_must_be_empty actual &&
- test_i18ngrep "unable to access.*gitignore" err
+ test_grep "unable to access.*gitignore" err
 '
 
 test_done

t/t0012-help.sh

@@ -100,17 +100,17 @@ test_expect_success "--help does not work for guides" "
 
 test_expect_success 'git help' '
  git help >help.output &&
- test_i18ngrep "^ clone " help.output &&
- test_i18ngrep "^ add " help.output &&
- test_i18ngrep "^ log " help.output &&
- test_i18ngrep "^ commit " help.output &&
- test_i18ngrep "^ fetch " help.output
+ test_grep "^ clone " help.output &&
+ test_grep "^ add " help.output &&
+ test_grep "^ log " help.output &&
+ test_grep "^ commit " help.output &&
+ test_grep "^ fetch " help.output
 '
 
 test_expect_success 'git help -g' '
  git help -g >help.output &&
- test_i18ngrep "^ everyday " help.output &&
- test_i18ngrep "^ tutorial " help.output
+ test_grep "^ everyday " help.output &&
+ test_grep "^ tutorial " help.output
 '
 
 test_expect_success 'git help fails for non-existing html pages' '
@@ -257,7 +257,7 @@ do
  export GIT_CEILING_DIRECTORIES &&
  test_expect_code 129 git -C sub $builtin -h >output 2>&1
  ) &&
- test_i18ngrep usage output
+ test_grep usage output
  '
 done <builtins
 

t/t0013-sha1dc.sh

@@ -16,7 +16,7 @@ fi
 
 test_expect_success 'test-sha1 detects shattered pdf' '
  test_must_fail test-tool sha1 <"$TEST_DATA/shattered-1.pdf" 2>err &&
- test_i18ngrep collision err &&
+ test_grep collision err &&
  grep 38762cf7f55934b34d179ae6a4c80cadccbb7f0a err
 '
 

t/t0014-alias.sh

@@ -8,23 +8,23 @@ test_expect_success 'nested aliases - internal execution' '
  git config alias.nested-internal-1 nested-internal-2 &&
  git config alias.nested-internal-2 status &&
  git nested-internal-1 >output &&
- test_i18ngrep "^On branch " output
+ test_grep "^On branch " output
 '
 
 test_expect_success 'nested aliases - mixed execution' '
  git config alias.nested-external-1 nested-external-2 &&
  git config alias.nested-external-2 "!git nested-external-3" &&
  git config alias.nested-external-3 status &&
  git nested-external-1 >output &&
- test_i18ngrep "^On branch " output
+ test_grep "^On branch " output
 '
 
 test_expect_success 'looping aliases - internal execution' '
  git config alias.loop-internal-1 loop-internal-2 &&
  git config alias.loop-internal-2 loop-internal-3 &&
  git config alias.loop-internal-3 loop-internal-2 &&
  test_must_fail git loop-internal-1 2>output &&
- test_i18ngrep "^fatal: alias loop detected: expansion of" output
+ test_grep "^fatal: alias loop detected: expansion of" output
 '
 
 # This test is disabled until external loops are fixed, because would block
@@ -34,7 +34,7 @@ test_expect_success 'looping aliases - internal execution' '
 # git config alias.loop-mixed-1 loop-mixed-2 &&
 # git config alias.loop-mixed-2 "!git loop-mixed-1" &&
 # test_must_fail git loop-mixed-1 2>output &&
-# test_i18ngrep "^fatal: alias loop detected: expansion of" output
+# test_grep "^fatal: alias loop detected: expansion of" output
 #'
 
 test_expect_success 'run-command formats empty args properly' '

t/t0021-conversion.sh

@@ -263,7 +263,7 @@ test_expect_success 'required filter with absent clean field' '
 
  echo test >test.ac &&
  test_must_fail git add test.ac 2>stderr &&
- test_i18ngrep "fatal: test.ac: clean filter .absentclean. failed" stderr
+ test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
 '
 
 test_expect_success 'required filter with absent smudge field' '
@@ -276,7 +276,7 @@ test_expect_success 'required filter with absent smudge field' '
  git add test.as &&
  rm -f test.as &&
  test_must_fail git checkout -- test.as 2>stderr &&
- test_i18ngrep "fatal: test.as: smudge filter absentsmudge failed" stderr
+ test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
 '
 
 test_expect_success 'filtering large input to small output should use little memory' '
@@ -733,7 +733,7 @@ test_expect_success 'process filter should restart after unexpected write failur
  git checkout --quiet --no-progress . 2>git-stderr.log &&
 
  grep "smudge write error" git-stderr.log &&
- test_i18ngrep "error: external filter" git-stderr.log &&
+ test_grep "error: external filter" git-stderr.log &&
 
  cat >expected.log <<-EOF &&
  START

t/t0028-working-tree-encoding.sh

@@ -92,23 +92,23 @@ do
  # In these cases the BOM is prohibited.
  cp bebom.utf${i}be.raw bebom.utf${i}be &&
  test_must_fail git add bebom.utf${i}be 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
  cp lebom.utf${i}le.raw lebom.utf${i}be &&
  test_must_fail git add lebom.utf${i}be 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
  cp bebom.utf${i}be.raw bebom.utf${i}le &&
  test_must_fail git add bebom.utf${i}le 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
  cp lebom.utf${i}le.raw lebom.utf${i}le &&
  test_must_fail git add lebom.utf${i}le 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out
+ test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out
  '
 
  test_expect_success "check required UTF-${i} BOM" '
@@ -118,13 +118,13 @@ do
 
  cp nobom.utf${i}be.raw nobom.utf${i} &&
  test_must_fail git add nobom.utf${i} 2>err.out &&
- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out &&
+ test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+ test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
 
  cp nobom.utf${i}le.raw nobom.utf${i} &&
  test_must_fail git add nobom.utf${i} 2>err.out &&
- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out
+ test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+ test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
  '
 
  test_expect_success "eol conversion for UTF-${i} encoded files on checkout" '
@@ -169,7 +169,7 @@ test_expect_success 'check unsupported encodings' '
  echo "*.set text working-tree-encoding" >.gitattributes &&
  printf "set" >t.set &&
  test_must_fail git add t.set 2>err.out &&
- test_i18ngrep "true/false are no valid working-tree-encodings" err.out &&
+ test_grep "true/false are no valid working-tree-encodings" err.out &&
 
  echo "*.unset text -working-tree-encoding" >.gitattributes &&
  printf "unset" >t.unset &&
@@ -182,7 +182,7 @@ test_expect_success 'check unsupported encodings' '
  echo "*.garbage text working-tree-encoding=garbage" >.gitattributes &&
  printf "garbage" >t.garbage &&
  test_must_fail git add t.garbage 2>err.out &&
- test_i18ngrep "failed to encode" err.out
+ test_grep "failed to encode" err.out
 '
 
 test_expect_success 'error if encoding round trip is not the same during refresh' '
@@ -201,7 +201,7 @@ test_expect_success 'error if encoding round trip is not the same during refresh
  git update-ref refs/heads/main $COMMIT &&
 
  test_must_fail git checkout HEAD^ 2>err.out &&
- test_i18ngrep "error: .* overwritten by checkout:" err.out
+ test_grep "error: .* overwritten by checkout:" err.out
 '
 
 test_expect_success 'error if encoding garbage is already in Git' '
@@ -217,7 +217,7 @@ test_expect_success 'error if encoding garbage is already in Git' '
  git update-ref refs/heads/main $COMMIT &&
 
  git diff 2>err.out &&
- test_i18ngrep "error: BOM is required" err.out
+ test_grep "error: BOM is required" err.out
 '
 
 test_lazy_prereq ICONV_SHIFT_JIS '

t/t0040-parse-options.sh

@@ -374,34 +374,34 @@ test_expect_success 'OPT_CMDMODE() works' '
 test_expect_success 'OPT_CMDMODE() detects incompatibility (1)' '
  test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
  test_must_be_empty output &&
- test_i18ngrep "mode1" output.err &&
- test_i18ngrep "mode2" output.err &&
- test_i18ngrep "is incompatible with" output.err
+ test_grep "mode1" output.err &&
+ test_grep "mode2" output.err &&
+ test_grep "is incompatible with" output.err
 '
 
 test_expect_success 'OPT_CMDMODE() detects incompatibility (2)' '
  test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
  test_must_be_empty output &&
- test_i18ngrep "mode2" output.err &&
- test_i18ngrep "set23" output.err &&
- test_i18ngrep "is incompatible with" output.err
+ test_grep "mode2" output.err &&
+ test_grep "set23" output.err &&
+ test_grep "is incompatible with" output.err
 '
 
 test_expect_success 'OPT_CMDMODE() detects incompatibility (3)' '
  test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
  test_must_be_empty output &&
- test_i18ngrep "mode2" output.err &&
- test_i18ngrep "set23" output.err &&
- test_i18ngrep "is incompatible with" output.err
+ test_grep "mode2" output.err &&
+ test_grep "set23" output.err &&
+ test_grep "is incompatible with" output.err
 '
 
 test_expect_success 'OPT_CMDMODE() detects incompatibility (4)' '
  test_must_fail test-tool parse-options --mode2 --mode34=3 \
  >output 2>output.err &&
  test_must_be_empty output &&
- test_i18ngrep "mode2" output.err &&
- test_i18ngrep "mode34.3" output.err &&
- test_i18ngrep "is incompatible with" output.err
+ test_grep "mode2" output.err &&
+ test_grep "mode34.3" output.err &&
+ test_grep "is incompatible with" output.err
 '
 
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '