[PATCH 2/2] tests: teach callers of test_i18ngrep to use test_grep
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 31, 2023, 05:23 UTC
- Message-ID
- <20231031052330.3762989-3-gitster@pobox.com>
- In-Reply-To
- <20231031052330.3762989-1-gitster@pobox.com>
They are equivalents and the former still exists, so as long as the only change this commit makes are to rewrite test_i18ngrep to test_grep, there won't be any new bug, even if there still are callers of test_i18ngrep remaining in the tree, or when merged to other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'and a good way to sanity check the result yourself is to run the above in a checkout of c4603c1c (test framework: further deprecate test_i18ngrep, 2023-10-31) and compare the resulting working tree contents with the result of applying this patch to the same commit. You'll see that test_i18ngrep in a few t/lib-*.sh files corrected, in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/lib-httpd.sh | 2 +- t/lib-submodule-update.sh | 2 +- t/t0001-init.sh | 16 +-- t/t0002-gitfile.sh | 4 +- t/t0003-attributes.sh | 4 +- t/t0008-ignores.sh | 4 +- t/t0012-help.sh | 16 +-- t/t0013-sha1dc.sh | 2 +- t/t0014-alias.sh | 8 +- t/t0021-conversion.sh | 6 +- t/t0028-working-tree-encoding.sh | 32 ++--- t/t0040-parse-options.sh | 4 +- t/t0041-usage.sh | 32 ++--- t/t0061-run-command.sh | 6 +- t/t0070-fundamental.sh | 4 +- t/t0091-bugreport.sh | 2 +- t/t0300-credentials.sh | 2 +- t/t1060-object-corruption.sh | 2 +- t/t1091-sparse-checkout-builtin.sh | 68 ++++----- t/t1092-sparse-checkout-compatibility.sh | 6 +- t/t1300-config.sh | 44 +++--- t/t1307-config-blob.sh | 2 +- t/t1308-config-set.sh | 10 +- t/t1309-early-config.sh | 2 +- t/t1310-config-default.sh | 4 +- t/t1400-update-ref.sh | 22 +-- t/t1404-update-ref-errors.sh | 4 +- t/t1410-reflog.sh | 6 +- t/t1416-ref-transaction-hooks.sh | 2 +- t/t1430-bad-ref-name.sh | 22 +-- t/t1450-fsck.sh | 80 +++++------ t/t1506-rev-parse-diagnosis.sh | 34 ++--- t/t1512-rev-parse-disambiguation.sh | 6 +- t/t2004-checkout-cache-temp.sh | 2 +- t/t2006-checkout-index-basic.sh | 14 +- t/t2010-checkout-ambiguous.sh | 4 +- t/t2018-checkout-branch.sh | 4 +- t/t2019-checkout-ambiguous-ref.sh | 8 +- t/t2020-checkout-detach.sh | 8 +- t/t2024-checkout-dwim.sh | 8 +- t/t2025-checkout-no-overlay.sh | 2 +- t/t2026-checkout-pathspec-file.sh | 8 +- t/t2027-checkout-track.sh | 2 +- t/t2030-unresolve-info.sh | 2 +- t/t2072-restore-pathspec-file.sh | 8 +- t/t2106-update-index-assume-unchanged.sh | 2 +- t/t2107-update-index-basic.sh | 4 +- t/t2203-add-intent.sh | 6 +- t/t2204-add-ignored.sh | 8 +- t/t2401-worktree-prune.sh | 10 +- t/t2402-worktree-list.sh | 6 +- t/t2403-worktree-move.sh | 2 +- t/t2406-worktree-repair.sh | 24 ++-- t/t3004-ls-files-basic.sh | 4 +- t/t3007-ls-files-recurse-submodules.sh | 4 +- t/t3200-branch.sh | 18 +-- t/t3202-show-branch.sh | 2 +- t/t3206-range-diff.sh | 22 +-- t/t3210-pack-refs.sh | 2 +- t/t3301-notes.sh | 4 +- t/t3310-notes-merge-manual-resolve.sh | 16 +-- t/t3320-notes-merge-worktrees.sh | 4 +- t/t3321-notes-stripspace.sh | 2 +- t/t3400-rebase.sh | 6 +- t/t3402-rebase-merge.sh | 2 +- t/t3403-rebase-skip.sh | 30 ++-- t/t3404-rebase-interactive.sh | 38 ++--- t/t3406-rebase-message.sh | 18 +-- t/t3418-rebase-continue.sh | 6 +- t/t3431-rebase-fork-point.sh | 2 +- t/t3501-revert-cherry-pick.sh | 6 +- t/t3507-cherry-pick-conflict.sh | 8 +- t/t3510-cherry-pick-sequence.sh | 6 +- t/t3600-rm.sh | 8 +- t/t3601-rm-pathspec-file.sh | 6 +- t/t3700-add.sh | 6 +- t/t3701-add-interactive.sh | 8 +- t/t3704-add-pathspec-file.sh | 12 +- t/t3900-i18n-commit.sh | 8 +- t/t3901-i18n-patch.sh | 2 +- t/t3903-stash.sh | 10 +- t/t3905-stash-include-untracked.sh | 2 +- t/t3909-stash-pathspec-file.sh | 6 +- t/t4001-diff-rename.sh | 34 ++--- t/t4013-diff-various.sh | 2 +- t/t4014-format-patch.sh | 12 +- t/t4015-diff-whitespace.sh | 20 +-- t/t4018-diff-funcname.sh | 14 +- t/t4031-diff-rewrite-binary.sh | 2 +- t/t4047-diff-dirstat.sh | 22 +-- t/t4053-diff-no-index.sh | 2 +- t/t4055-diff-context.sh | 4 +- t/t4068-diff-symmetric-merge-base.sh | 28 ++-- t/t4115-apply-symlink.sh | 2 +- t/t4120-apply-popt.sh | 4 +- t/t4122-apply-symlink-inside.sh | 14 +- t/t4129-apply-samemode.sh | 4 +- t/t4133-apply-filenames.sh | 8 +- t/t4150-am.sh | 4 +- t/t4151-am-abort.sh | 2 +- t/t4153-am-resume-override-opts.sh | 2 +- t/t4200-rerere.sh | 4 +- t/t4201-shortlog.sh | 2 +- t/t4202-log.sh | 18 +-- t/t4203-mailmap.sh | 2 +- t/t4208-log-magic-pathspec.sh | 6 +- t/t4209-log-pickaxe.sh | 4 +- t/t4211-line-log.sh | 4 +- t/t4212-log-corrupt.sh | 2 +- t/t4256-am-format-flowed.sh | 2 +- t/t5300-pack-object.sh | 4 +- t/t5302-pack-index.sh | 4 +- t/t5304-prune.sh | 4 +- t/t5310-pack-bitmaps.sh | 8 +- t/t5318-commit-graph.sh | 18 +-- t/t5319-multi-pack-index.sh | 10 +- t/t5324-split-commit-graph.sh | 16 +-- t/t5331-pack-objects-stdin.sh | 4 +- t/t5411/test-0026-push-options.sh | 2 +- t/t5411/test-0027-push-options--porcelain.sh | 2 +- t/t5500-fetch-pack.sh | 10 +- t/t5504-fetch-receive-strict.sh | 26 ++-- t/t5505-remote.sh | 22 +-- t/t5510-fetch.sh | 8 +- t/t5512-ls-remote.sh | 2 +- t/t5514-fetch-multiple.sh | 4 +- t/t5516-fetch-push.sh | 8 +- t/t5520-pull.sh | 34 ++--- t/t5521-pull-options.sh | 2 +- t/t5523-push-upstream.sh | 12 +- t/t5528-push-default.sh | 2 +- t/t5530-upload-pack-error.sh | 4 +- t/t5531-deep-submodule-push.sh | 2 +- t/t5534-push-signed.sh | 6 +- t/t5536-fetch-conflicts.sh | 8 +- t/t5541-http-push-smart.sh | 20 +-- t/t5545-push-options.sh | 2 +- t/t5550-http-fetch-dumb.sh | 8 +- t/t5551-http-fetch-smart.sh | 4 +- t/t5570-git-daemon.sh | 10 +- t/t5572-pull-submodule.sh | 2 +- t/t5573-pull-verify-signatures.sh | 26 ++-- t/t5574-fetch-output.sh | 4 +- t/t5580-unc-paths.sh | 2 +- t/t5601-clone.sh | 6 +- t/t5604-clone-reference.sh | 2 +- t/t5606-clone-options.sh | 10 +- t/t5607-clone-bundle.sh | 4 +- t/t5611-clone-config.sh | 4 +- t/t5616-partial-clone.sh | 22 +-- t/t5701-git-serve.sh | 8 +- t/t5702-protocol-v2.sh | 34 ++--- t/t5703-upload-pack-ref-in-want.sh | 4 +- t/t5704-protocol-violations.sh | 4 +- t/t5801-remote-helpers.sh | 8 +- t/t5812-proto-disable-http.sh | 2 +- t/t6001-rev-list-graft.sh | 4 +- t/t6021-rev-list-exclude-hidden.sh | 4 +- t/t6030-bisect-porcelain.sh | 24 ++-- t/t6040-tracking-info.sh | 18 +-- t/t6050-replace.sh | 14 +- t/t6102-rev-list-unexpected-objects.sh | 16 +-- t/t6112-rev-list-filters-objects.sh | 2 +- t/t6120-describe.sh | 2 +- t/t6134-pathspec-in-submodule.sh | 2 +- t/t6135-pathspec-with-attrs.sh | 8 +- t/t6136-pathspec-in-bare.sh | 8 +- t/t6402-merge-rename.sh | 16 +-- t/t6422-merge-rename-corner-cases.sh | 16 +-- t/t6423-merge-rename-directories.sh | 140 +++++++++---------- t/t6424-merge-unrelated-index-changes.sh | 6 +- t/t6425-merge-rename-delete.sh | 4 +- t/t6426-merge-skip-unneeded-updates.sh | 2 +- t/t6430-merge-recursive.sh | 8 +- t/t6433-merge-toplevel.sh | 4 +- t/t6436-merge-overwrite.sh | 4 +- t/t6437-submodule-merge.sh | 2 +- t/t6500-gc.sh | 14 +- t/t7001-mv.sh | 4 +- t/t7105-reset-patch.sh | 6 +- t/t7106-reset-unborn-branch.sh | 2 +- t/t7107-reset-pathspec-file.sh | 10 +- t/t7110-reset-merge.sh | 6 +- t/t7201-co.sh | 4 +- t/t7300-clean.sh | 2 +- t/t7400-submodule-basic.sh | 64 ++++----- t/t7403-submodule-sync.sh | 4 +- t/t7406-submodule-update.sh | 6 +- t/t7411-submodule-config.sh | 4 +- t/t7414-submodule-mistakes.sh | 8 +- t/t7416-submodule-dash-url.sh | 4 +- t/t7417-submodule-path-url.sh | 4 +- t/t7450-bad-git-dotfiles.sh | 12 +- t/t7500-commit-template-squash-signoff.sh | 2 +- t/t7501-commit-basic-functionality.sh | 6 +- t/t7502-commit-porcelain.sh | 32 ++--- t/t7506-status-submodule.sh | 28 ++-- t/t7507-commit-verbose.sh | 4 +- t/t7508-status.sh | 24 ++-- t/t7509-commit-authorship.sh | 4 +- t/t7518-ident-corner-cases.sh | 10 +- t/t7519-status-fsmonitor.sh | 6 +- t/t7520-ignored-hook-warning.sh | 8 +- t/t7525-status-rename.sh | 54 +++---- t/t7526-commit-pathspec-file.sh | 14 +- t/t7600-merge.sh | 30 ++-- t/t7601-merge-pull-config.sh | 50 +++---- t/t7611-merge-abort.sh | 4 +- t/t7612-merge-verify-signatures.sh | 24 ++-- t/t7703-repack-geometric.sh | 4 +- t/t7800-difftool.sh | 4 +- t/t7810-grep.sh | 4 +- t/t7811-grep-open.sh | 2 +- t/t7814-grep-recurse-submodules.sh | 2 +- t/t7816-grep-binary-pattern.sh | 4 +- t/t7900-maintenance.sh | 24 ++-- t/t8003-blame-corner-cases.sh | 2 +- t/t8013-blame-ignore-revs.sh | 6 +- t/t9001-send-email.sh | 8 +- t/t9300-fast-import.sh | 26 ++-- t/t9800-git-p4-basic.sh | 18 +-- t/t9801-git-p4-branch.sh | 2 +- t/t9807-git-p4-submit.sh | 12 +- t/t9815-git-p4-submit-fail.sh | 12 +- 224 files changed, 1190 insertions(+), 1190 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 2fb1b2ae56..5fe3c8ab69 100644 --- a/t/lib-httpd.sh +++ b/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' ' diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index 9acb0d5d19..36f767cb74 100644 --- a/t/lib-submodule-update.sh +++ b/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 ) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 30a6edca1d..2b78e3be47 100755 --- a/t/t0001-init.sh +++ b/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,7 +332,7 @@ 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' ' @@ -340,7 +340,7 @@ test_expect_success 'implicit bare & --separate-git-dir incompatible' ' 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' ' diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index e013d38f48..736516cc6a 100755 --- a/t/t0002-gitfile.sh +++ b/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' ' diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 26e082f05b..42695e143d 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -259,7 +259,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' ' @@ -424,7 +424,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' ' diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index c70d11bc91..361446b2f4 100755 --- a/t/t0008-ignores.sh +++ b/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 diff --git a/t/t0012-help.sh b/t/t0012-help.sh index dbfc5c8267..1d273d91c2 100755 --- a/t/t0012-help.sh +++ b/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 diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh index 5324047689..08814173cb 100755 --- a/t/t0013-sha1dc.sh +++ b/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 ' diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh index 8d3d9144c0..95568342be 100755 --- a/t/t0014-alias.sh +++ b/t/t0014-alias.sh @@ -8,7 +8,7 @@ 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' ' @@ -16,7 +16,7 @@ test_expect_success 'nested aliases - mixed execution' ' 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' ' @@ -24,7 +24,7 @@ test_expect_success 'looping aliases - internal execution' ' 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' ' diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 46abbeed68..0b4997022b 100755 --- a/t/t0021-conversion.sh +++ b/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 diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh index c196fdb0ee..1b55f59c23 100755 --- a/t/t0028-working-tree-encoding.sh +++ b/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 ' diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index e19a199636..c8cc0fd8d0 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -366,13 +366,13 @@ test_expect_success 'OPT_CMDMODE() works' ' test_expect_success 'OPT_CMDMODE() detects incompatibility' ' test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err && test_must_be_empty output && - test_i18ngrep "incompatible with --mode" output.err + test_grep "incompatible with --mode" output.err ' test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' ' test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err && test_must_be_empty output && - test_i18ngrep "incompatible with something else" output.err + test_grep "incompatible with something else" output.err ' test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' ' diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh index 9ea974b0c6..1464294bd1 100755 --- a/t/t0041-usage.sh +++ b/t/t0041-usage.sh @@ -21,8 +21,8 @@ test_expect_success 'tag --contains <existent_tag>' ' test_expect_success 'tag --contains <inexistent_tag>' ' test_must_fail git tag --contains "notag" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'tag --no-contains <existent_tag>' ' @@ -34,27 +34,27 @@ test_expect_success 'tag --no-contains <existent_tag>' ' test_expect_success 'tag --no-contains <inexistent_tag>' ' test_must_fail git tag --no-contains "notag" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'tag usage error' ' test_must_fail git tag --noopt >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "usage" actual.err + test_grep "usage" actual.err ' test_expect_success 'branch --contains <existent_commit>' ' git branch --contains "main" >actual 2>actual.err && - test_i18ngrep "main" actual && + test_grep "main" actual && test_line_count = 0 actual.err ' test_expect_success 'branch --contains <inexistent_commit>' ' test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'branch --no-contains <existent_commit>' ' @@ -66,14 +66,14 @@ test_expect_success 'branch --no-contains <existent_commit>' ' test_expect_success 'branch --no-contains <inexistent_commit>' ' test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'branch usage error' ' test_must_fail git branch --noopt >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "usage" actual.err + test_grep "usage" actual.err ' test_expect_success 'for-each-ref --contains <existent_object>' ' @@ -85,8 +85,8 @@ test_expect_success 'for-each-ref --contains <existent_object>' ' test_expect_success 'for-each-ref --contains <inexistent_object>' ' test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'for-each-ref --no-contains <existent_object>' ' @@ -98,14 +98,14 @@ test_expect_success 'for-each-ref --no-contains <existent_object>' ' test_expect_success 'for-each-ref --no-contains <inexistent_object>' ' test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "error" actual.err && - test_i18ngrep ! "usage" actual.err + test_grep "error" actual.err && + test_grep ! "usage" actual.err ' test_expect_success 'for-each-ref usage error' ' test_must_fail git for-each-ref --noopt >actual 2>actual.err && test_line_count = 0 actual && - test_i18ngrep "usage" actual.err + test_grep "usage" actual.err ' test_done diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index e2411f6a9b..20986b693c 100755 --- a/t/t0061-run-command.sh +++ b/t/t0061-run-command.sh @@ -19,12 +19,12 @@ test_expect_success MINGW 'subprocess inherits only std handles' ' test_expect_success 'start_command reports ENOENT (slash)' ' test-tool run-command start-command-ENOENT ./does-not-exist 2>err && - test_i18ngrep "\./does-not-exist" err + test_grep "\./does-not-exist" err ' test_expect_success 'start_command reports ENOENT (no slash)' ' test-tool run-command start-command-ENOENT does-not-exist 2>err && - test_i18ngrep "does-not-exist" err + test_grep "does-not-exist" err ' test_expect_success 'run_command can run a command' ' @@ -49,7 +49,7 @@ test_expect_success !RUNS_COMMANDS_FROM_PWD 'run_command is restricted to PATH' echo yikes EOF test_must_fail test-tool run-command run-command should-not-run 2>err && - test_i18ngrep "should-not-run" err + test_grep "should-not-run" err ' test_expect_success !MINGW 'run_command can run a script without a #! line' ' diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 574de34198..487bc8d905 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -44,13 +44,13 @@ test_expect_success 'incomplete sideband messages are reassembled' ' test_expect_success 'eof on sideband message is reported' ' printf 1234 >input && test-tool pkt-line receive-sideband <input 2>err && - test_i18ngrep "unexpected disconnect" err + test_grep "unexpected disconnect" err ' test_expect_success 'missing sideband designator is reported' ' printf 0004 >input && test-tool pkt-line receive-sideband <input 2>err && - test_i18ngrep "missing sideband" err + test_grep "missing sideband" err ' test_done diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh index f6998269be..150cc1dea2 100755 --- a/t/t0091-bugreport.sh +++ b/t/t0091-bugreport.sh @@ -65,7 +65,7 @@ test_expect_success '--output-directory puts the report in the provided dir' ' test_expect_success 'incorrect arguments abort with usage' ' test_must_fail git bugreport --false 2>output && - test_i18ngrep usage output && + test_grep usage output && test_path_is_missing git-bugreport-* ' diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh index a4f5bba507..400f6bdbca 100755 --- a/t/t0300-credentials.sh +++ b/t/t0300-credentials.sh @@ -827,7 +827,7 @@ test_expect_success 'credential config with partial URLs' ' git -c credential.$partial.helper=yep \ -c credential.with%0anewline.username=uh-oh \ credential fill <stdin 2>stderr && - test_i18ngrep "skipping credential lookup for key" stderr + test_grep "skipping credential lookup for key" stderr ' test_done diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh index 35261afc9d..5e0f0a334f 100755 --- a/t/t1060-object-corruption.sh +++ b/t/t1060-object-corruption.sh @@ -125,7 +125,7 @@ test_expect_success 'fetch into corrupted repo with index-pack' ' cd bit-error-cp && test_must_fail git -c transfer.unpackLimit=1 \ fetch ../no-bit-error 2>stderr && - test_i18ngrep ! -i collision stderr + test_grep ! -i collision stderr ) ' diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 9ceb17f911..f67611da28 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -47,7 +47,7 @@ test_expect_success 'setup' ' test_expect_success 'git sparse-checkout list (not sparse)' ' test_must_fail git -C repo sparse-checkout list >list 2>err && test_must_be_empty list && - test_i18ngrep "this worktree is not sparse" err + test_grep "this worktree is not sparse" err ' test_expect_success 'git sparse-checkout list (not sparse)' ' @@ -55,7 +55,7 @@ test_expect_success 'git sparse-checkout list (not sparse)' ' rm repo/.git/info/sparse-checkout && git -C repo sparse-checkout list >list 2>err && test_must_be_empty list && - test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err + test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err ' test_expect_success 'git sparse-checkout list (populated)' ' @@ -230,7 +230,7 @@ test_expect_success 'cone mode: match patterns' ' git -C repo config --worktree core.sparseCheckoutCone true && rm -rf repo/a repo/folder1 repo/folder2 && git -C repo read-tree -mu HEAD 2>err && - test_i18ngrep ! "disabling cone patterns" err && + test_grep ! "disabling cone patterns" err && git -C repo reset --hard && check_files repo a folder1 folder2 ' @@ -240,7 +240,7 @@ test_expect_success 'cone mode: warn on bad pattern' ' cp repo/.git/info/sparse-checkout . && echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout && git -C repo read-tree -mu HEAD 2>err && - test_i18ngrep "unrecognized negative pattern" err + test_grep "unrecognized negative pattern" err ' test_expect_success 'sparse-checkout disable' ' @@ -283,7 +283,7 @@ test_expect_success 'sparse-index enabled and disabled' ' test_expect_success 'cone mode: init and set' ' git -C repo sparse-checkout init --cone && git -C repo config --list >config && - test_i18ngrep "core.sparsecheckoutcone=true" config && + test_grep "core.sparsecheckoutcone=true" config && list_files repo >dir && echo a >expect && test_cmp expect dir && @@ -386,7 +386,7 @@ test_expect_success 'not-up-to-date does not block rest of sparsification' ' git -C repo sparse-checkout set deep/deeper1 2>err && - test_i18ngrep "The following paths are not up to date" err && + test_grep "The following paths are not up to date" err && test_cmp expect repo/.git/info/sparse-checkout && check_files repo/deep a deeper1 deeper2 && check_files repo/deep/deeper1 a deepest && @@ -401,8 +401,8 @@ test_expect_success 'revert to old sparse-checkout on empty update' ' git add file && git commit -m "test" && git sparse-checkout set nothing 2>err && - test_i18ngrep ! "Sparse checkout leaves no entry on working directory" err && - test_i18ngrep ! ".git/index.lock" err && + test_grep ! "Sparse checkout leaves no entry on working directory" err && + test_grep ! ".git/index.lock" err && git sparse-checkout set --no-cone file ) ' @@ -411,14 +411,14 @@ test_expect_success 'fail when lock is taken' ' test_when_finished rm -rf repo/.git/info/sparse-checkout.lock && touch repo/.git/info/sparse-checkout.lock && test_must_fail git -C repo sparse-checkout set deep 2>err && - test_i18ngrep "Unable to create .*\.lock" err + test_grep "Unable to create .*\.lock" err ' test_expect_success '.gitignore should not warn about cone mode' ' git -C repo config --worktree core.sparseCheckoutCone true && echo "**/bin/*" >repo/.gitignore && git -C repo reset --hard 2>err && - test_i18ngrep ! "disabling cone patterns" err + test_grep ! "disabling cone patterns" err ' test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' ' @@ -426,10 +426,10 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' echo dirty >dirty/folder1/a && git -C dirty sparse-checkout init --no-cone 2>err && - test_i18ngrep "warning.*The following paths are not up to date" err && + test_grep "warning.*The following paths are not up to date" err && git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err && - test_i18ngrep "warning.*The following paths are not up to date" err && + test_grep "warning.*The following paths are not up to date" err && test_path_is_file dirty/folder1/a && git -C dirty sparse-checkout disable 2>err && @@ -453,14 +453,14 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged stat git -C unmerged update-index --index-info <input && git -C unmerged sparse-checkout init --no-cone 2>err && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are unmerged" err && git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are unmerged" err && test_path_is_file dirty/folder1/a && git -C unmerged sparse-checkout disable 2>err && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are unmerged" err && git -C unmerged reset --hard && git -C unmerged sparse-checkout init --no-cone && @@ -480,24 +480,24 @@ test_expect_failure 'sparse-checkout reapply' ' git -C tweak update-index --index-info <input && git -C tweak sparse-checkout init --cone 2>err && - test_i18ngrep "warning.*The following paths are not up to date" err && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are not up to date" err && + test_grep "warning.*The following paths are unmerged" err && git -C tweak sparse-checkout set folder2 deep/deeper1 2>err && - test_i18ngrep "warning.*The following paths are not up to date" err && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are not up to date" err && + test_grep "warning.*The following paths are unmerged" err && git -C tweak sparse-checkout reapply 2>err && - test_i18ngrep "warning.*The following paths are not up to date" err && + test_grep "warning.*The following paths are not up to date" err && test_path_is_file tweak/deep/deeper2/a && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are unmerged" err && test_path_is_file tweak/folder1/a && git -C tweak checkout HEAD deep/deeper2/a && git -C tweak sparse-checkout reapply 2>err && - test_i18ngrep ! "warning.*The following paths are not up to date" err && + test_grep ! "warning.*The following paths are not up to date" err && test_path_is_missing tweak/deep/deeper2/a && - test_i18ngrep "warning.*The following paths are unmerged" err && + test_grep "warning.*The following paths are unmerged" err && test_path_is_file tweak/folder1/a && # NEEDSWORK: We are asking to update a file outside of the @@ -578,8 +578,8 @@ test_expect_success 'check-rules interaction with submodules' ' git -C super ls-tree --name-only -r HEAD >all-files && git -C super sparse-checkout check-rules >check-rules-matches <all-files && - test_i18ngrep ! "modules/" check-rules-matches && - test_i18ngrep "folder1/" check-rules-matches + test_grep ! "modules/" check-rules-matches && + test_grep "folder1/" check-rules-matches ' test_expect_success 'different sparse-checkouts with worktrees' ' @@ -616,7 +616,7 @@ check_read_tree_errors () { then test_must_be_empty err else - test_i18ngrep "$ERRORS" err + test_grep "$ERRORS" err fi && check_files $REPO $FILES } @@ -898,32 +898,32 @@ test_expect_success 'setup bare repo' ' ' test_expect_success 'list fails outside work tree' ' test_must_fail git -C bare sparse-checkout list 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'add fails outside work tree' ' test_must_fail git -C bare sparse-checkout add deeper 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'set fails outside work tree' ' test_must_fail git -C bare sparse-checkout set deeper 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'init fails outside work tree' ' test_must_fail git -C bare sparse-checkout init 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'reapply fails outside work tree' ' test_must_fail git -C bare sparse-checkout reapply 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'disable fails outside work tree' ' test_must_fail git -C bare sparse-checkout disable 2>err && - test_i18ngrep "this operation must be run in a work tree" err + test_grep "this operation must be run in a work tree" err ' test_expect_success 'setup clean' ' @@ -946,8 +946,8 @@ test_expect_success 'check-rules cone mode' ' git -C repo sparse-checkout check-rules >check-rules-default <all-files && - test_i18ngrep "deep/deeper1/deepest/a" check-rules-file && - test_i18ngrep ! "deep/deeper2" check-rules-file && + test_grep "deep/deeper1/deepest/a" check-rules-file && + test_grep ! "deep/deeper2" check-rules-file && test_cmp check-rules-file ls-files && test_cmp check-rules-file check-rules-default diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 8a95adf4b5..12e971b1d1 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -337,8 +337,8 @@ test_expect_success 'status reports sparse-checkout' ' init_repos && git -C sparse-checkout status >full && git -C sparse-index status >sparse && - test_i18ngrep "You are in a sparse checkout with " full && - test_i18ngrep "You are in a sparse checkout." sparse + test_grep "You are in a sparse checkout with " full && + test_grep "You are in a sparse checkout." sparse ' test_expect_success 'add, commit, checkout' ' @@ -1182,7 +1182,7 @@ test_expect_success 'checkout-index outside sparse definition' ' # Without --ignore-skip-worktree-bits, outside-of-cone files will trigger # an error test_sparse_match test_must_fail git checkout-index -- folder1/a && - test_i18ngrep "folder1/a has skip-worktree enabled" sparse-checkout-err && + test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err && test_path_is_missing folder1/a && # With --ignore-skip-worktree-bits, outside-of-cone files are checked out diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 387d336c91..f4e2752134 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -453,7 +453,7 @@ test_expect_success 'get bool variable with empty value' ' test_expect_success 'no arguments, but no crash' ' test_must_fail git config >output 2>&1 && - test_i18ngrep usage output + test_grep usage output ' cat > .git/config << EOF @@ -720,25 +720,25 @@ test_expect_success 'invalid unit' ' git config aninvalid.unit "1auto" && test_cmp_config 1auto aninvalid.unit && test_must_fail git config --int --get aninvalid.unit 2>actual && - test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual + test_grep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual ' test_expect_success 'invalid unit boolean' ' git config commit.gpgsign "1true" && test_cmp_config 1true commit.gpgsign && test_must_fail git config --bool --get commit.gpgsign 2>actual && - test_i18ngrep "bad boolean config value .1true. for .commit.gpgsign." actual + test_grep "bad boolean config value .1true. for .commit.gpgsign." actual ' test_expect_success 'line number is reported correctly' ' printf "[bool]\n\tvar\n" >invalid && test_must_fail git config -f invalid --path bool.var 2>actual && - test_i18ngrep "line 2" actual + test_grep "line 2" actual ' test_expect_success 'invalid stdin config' ' echo "[broken" | test_must_fail git config --list --file - >output 2>&1 && - test_i18ngrep "bad config line 1 in standard input" output + test_grep "bad config line 1 in standard input" output ' cat > expect << EOF @@ -919,7 +919,7 @@ test_expect_success !MINGW 'get --path copes with unset $HOME' ' git config --get --path path.normal >>result && git config --get --path path.trailingtilde >>result ) && - test_i18ngrep "[Ff]ailed to expand.*~/" msg && + test_grep "[Ff]ailed to expand.*~/" msg && test_cmp expect result ' @@ -986,7 +986,7 @@ test_expect_success 'get --type=color barfs on non-color' ' test_expect_success 'set --type=color barfs on non-color' ' test_must_fail git config --type=color foo.color "not-a-color" 2>error && - test_i18ngrep "cannot parse color" error + test_grep "cannot parse color" error ' cat > expect << EOF @@ -1447,12 +1447,12 @@ test_expect_success 'git --config-env with missing value' ' test_expect_success 'git --config-env fails with invalid parameters' ' test_must_fail git --config-env=foo.flag config --bool foo.flag 2>error && - test_i18ngrep "invalid config format: foo.flag" error && + test_grep "invalid config format: foo.flag" error && test_must_fail git --config-env=foo.flag= config --bool foo.flag 2>error && - test_i18ngrep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error && + test_grep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error && sane_unset NONEXISTENT && test_must_fail git --config-env=foo.flag=NONEXISTENT config --bool foo.flag 2>error && - test_i18ngrep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error + test_grep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error ' test_expect_success 'git -c and --config-env work together' ' @@ -1533,21 +1533,21 @@ test_expect_success 'git config ignores pairs with empty count' ' test_expect_success 'git config fails with invalid count' ' test_must_fail env GIT_CONFIG_COUNT=10a git config --list 2>error && - test_i18ngrep "bogus count" error && + test_grep "bogus count" error && test_must_fail env GIT_CONFIG_COUNT=9999999999999999 git config --list 2>error && - test_i18ngrep "too many entries" error + test_grep "too many entries" error ' test_expect_success 'git config fails with missing config key' ' test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_VALUE_0="value" \ git config --list 2>error && - test_i18ngrep "missing config key" error + test_grep "missing config key" error ' test_expect_success 'git config fails with missing config value' ' test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0="pair.one" \ git config --list 2>error && - test_i18ngrep "missing config value" error + test_grep "missing config value" error ' test_expect_success 'git config fails with invalid config pair key' ' @@ -1617,7 +1617,7 @@ test_expect_success 'barf on syntax error' ' key garbage EOF test_must_fail git config --get section.key 2>error && - test_i18ngrep " line 3 " error + test_grep " line 3 " error ' test_expect_success 'barf on incomplete section header' ' @@ -1627,7 +1627,7 @@ test_expect_success 'barf on incomplete section header' ' key = value EOF test_must_fail git config --get section.key 2>error && - test_i18ngrep " line 2 " error + test_grep " line 2 " error ' test_expect_success 'barf on incomplete string' ' @@ -1637,7 +1637,7 @@ test_expect_success 'barf on incomplete string' ' key = "value string EOF test_must_fail git config --get section.key 2>error && - test_i18ngrep " line 3 " error + test_grep " line 3 " error ' test_expect_success 'urlmatch' ' @@ -2266,17 +2266,17 @@ test_expect_success 'identical mixed --type specifiers are allowed' ' test_expect_success 'non-identical modern --type specifiers are not allowed' ' test_must_fail git config --type=int --type=bool section.big 2>error && - test_i18ngrep "only one type at a time" error + test_grep "only one type at a time" error ' test_expect_success 'non-identical legacy --type specifiers are not allowed' ' test_must_fail git config --int --bool section.big 2>error && - test_i18ngrep "only one type at a time" error + test_grep "only one type at a time" error ' test_expect_success 'non-identical mixed --type specifiers are not allowed' ' test_must_fail git config --type=int --bool section.big 2>error && - test_i18ngrep "only one type at a time" error + test_grep "only one type at a time" error ' test_expect_success '--type allows valid type specifiers' ' @@ -2293,7 +2293,7 @@ test_expect_success 'unset type specifiers may be reset to conflicting ones' ' test_expect_success '--type rejects unknown specifiers' ' test_must_fail git config --type=nonsense section.foo 2>error && - test_i18ngrep "unrecognized --type argument" error + test_grep "unrecognized --type argument" error ' test_expect_success '--type=int requires at least one digit' ' @@ -2339,7 +2339,7 @@ test_expect_success 'set all config with value-pattern' ' # multiple matches => failure test_must_fail git config --file=config abc.key three o+ 2>err && - test_i18ngrep "has multiple values" err && + test_grep "has multiple values" err && # multiple values, no match => add git config --file=config abc.key three a+ && diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh index 0a7099d6f5..b9852fe40e 100755 --- a/t/t1307-config-blob.sh +++ b/t/t1307-config-blob.sh @@ -63,7 +63,7 @@ test_expect_success 'parse errors in blobs are properly attributed' ' git commit -m broken && test_must_fail git config --blob=HEAD:config some.value 2>err && - test_i18ngrep "HEAD:config" err + test_grep "HEAD:config" err ' test_expect_success 'can parse blob ending with CR' ' diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh index 777648722c..3bfec07f1a 100755 --- a/t/t1308-config-set.sh +++ b/t/t1308-config-set.sh @@ -172,7 +172,7 @@ test_expect_success 'find string value for a key' ' test_expect_success 'check line error when NULL string is queried' ' test_expect_code 128 test-tool config get_string case.foo 2>result && - test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result + test_grep "fatal: .*case\.foo.*\.git/config.*line 7" result ' test_expect_success 'find integer if value is non parse-able' ' @@ -342,14 +342,14 @@ test_expect_success 'check line errors for malformed values' ' br EOF test_expect_code 128 git br 2>result && - test_i18ngrep "missing value for .alias\.br" result && - test_i18ngrep "fatal: .*\.git/config" result && - test_i18ngrep "fatal: .*line 2" result + test_grep "missing value for .alias\.br" result && + test_grep "fatal: .*\.git/config" result && + test_grep "fatal: .*line 2" result ' test_expect_success 'error on modifying repo config without repo' ' nongit test_must_fail git config a.b c 2>err && - test_i18ngrep "not in a git directory" err + test_grep "not in a git directory" err ' cmdline_config="'foo.bar=from-cmdline'" diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh index 537435b90a..523aa99a1e 100755 --- a/t/t1309-early-config.sh +++ b/t/t1309-early-config.sh @@ -78,7 +78,7 @@ test_with_config () { test_expect_success 'ignore .git/ with incompatible repository version' ' test_with_config "[core]repositoryformatversion = 999999" 2>err && - test_i18ngrep "warning:.* Expected git repo version <= [1-9]" err + test_grep "warning:.* Expected git repo version <= [1-9]" err ' test_expect_failure 'ignore .git/ with invalid repository version' ' diff --git a/t/t1310-config-default.sh b/t/t1310-config-default.sh index 09b10c144b..1a90d31201 100755 --- a/t/t1310-config-default.sh +++ b/t/t1310-config-default.sh @@ -26,12 +26,12 @@ test_expect_success 'canonicalizes --default with appropriate type' ' test_expect_success 'dies when --default cannot be parsed' ' test_must_fail git config -f config --type=expiry-date --default=x --get \ not.a.section 2>error && - test_i18ngrep "failed to format default config value" error + test_grep "failed to format default config value" error ' test_expect_success 'does not allow --default without --get' ' test_must_fail git config --default=quux --unset a.section >output 2>&1 && - test_i18ngrep "\-\-default is only applicable to" output + test_grep "\-\-default is only applicable to" output ' test_done diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 4d66cd7f4a..9ac4b7036b 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -410,7 +410,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" && @@ -431,7 +431,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 .git/$m .git/logs/$m expect @@ -486,7 +486,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' ' @@ -507,7 +507,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' ' @@ -519,7 +519,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' ' @@ -536,7 +536,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 @@ -556,7 +556,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' ' @@ -674,7 +674,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' ' @@ -1107,7 +1107,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' ' @@ -1338,7 +1338,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 && @@ -1355,7 +1355,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 && diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh index 937ae0d733..0369beea33 100755 --- a/t/t1404-update-ref-errors.sh +++ b/t/t1404-update-ref-errors.sh @@ -29,7 +29,7 @@ test_update_rejected () { fi && printf "create $prefix/%s $C\n" $create >input && test_must_fail git update-ref --stdin <input 2>output.err && - test_i18ngrep -F "$error" output.err && + test_grep -F "$error" output.err && git for-each-ref $prefix >actual && test_cmp unchanged actual } @@ -613,7 +613,7 @@ test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked test_when_finished "rm -f .git/packed-refs.lock" && test_must_fail git update-ref -d $prefix/foo >out 2>err && git for-each-ref $prefix >actual && - test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err && + test_grep "Unable to create $SQ.*packed-refs.lock$SQ: " err && test_cmp unchanged actual ' diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 6c45965b1e..e1fc949f9a 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -29,7 +29,7 @@ check_fsck () { '') test_must_be_empty fsck.output ;; *) - test_i18ngrep "$1" fsck.output ;; + test_grep "$1" fsck.output ;; esac } @@ -308,9 +308,9 @@ test_expect_success 'git reflog expire unknown reference' ' test_config gc.reflogexpireunreachable never && test_must_fail git reflog expire main@{123} 2>stderr && - test_i18ngrep "points nowhere" stderr && + test_grep "points nowhere" stderr && test_must_fail git reflog expire does-not-exist 2>stderr && - test_i18ngrep "points nowhere" stderr + test_grep "points nowhere" stderr ' test_expect_success 'checkout should not delete log for packed ref' ' diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh index b32ca798f9..2092488090 100755 --- a/t/t1416-ref-transaction-hooks.sh +++ b/t/t1416-ref-transaction-hooks.sh @@ -37,7 +37,7 @@ test_expect_success 'hook aborts updating ref in prepared state' ' fi EOF test_must_fail git update-ref HEAD POST 2>err && - test_i18ngrep "ref updates aborted by hook" err + test_grep "ref updates aborted by hook" err ' test_expect_success 'hook gets all queued updates in prepared state' ' diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index ff1c967d55..4da539cf50 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -47,7 +47,7 @@ test_expect_success 'git branch shows badly named ref as warning' ' test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" && git branch >output 2>error && - test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && + test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" output ' @@ -158,7 +158,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' ' git rev-parse --verify one >expect && git rev-parse --verify shadow >actual 2>err && test_cmp expect actual && - test_i18ngrep "ignoring dangling symref refs/tags/shadow" err + test_grep "ignoring dangling symref refs/tags/shadow" err ' test_expect_success 'for-each-ref emits warnings for broken names' ' @@ -172,9 +172,9 @@ test_expect_success 'for-each-ref emits warnings for broken names' ' ! grep -e "broken\.\.\.ref" output && ! grep -e "badname" output && ! grep -e "broken\.\.\.symref" output && - test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && - test_i18ngrep ! "ignoring broken ref refs/heads/badname" error && - test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error + test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && + test_grep ! "ignoring broken ref refs/heads/badname" error && + test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error ' test_expect_success 'update-ref -d can delete broken name' ' @@ -192,7 +192,7 @@ test_expect_success 'branch -d can delete broken name' ' test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" && git branch -d broken...ref >output 2>error && - test_i18ngrep "Deleted branch broken...ref (was broken)" output && + test_grep "Deleted branch broken...ref (was broken)" output && test_must_be_empty error && git branch >output 2>error && ! grep -e "broken\.\.\.ref" error && @@ -218,7 +218,7 @@ test_expect_success 'branch -d can delete symref to broken name' ' test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" && git branch -d badname >output 2>error && test_path_is_missing .git/refs/heads/badname && - test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_must_be_empty error ' @@ -236,7 +236,7 @@ test_expect_success 'branch -d can delete dangling symref to broken name' ' test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" && git branch -d badname >output 2>error && test_path_is_missing .git/refs/heads/badname && - test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_must_be_empty error ' @@ -265,7 +265,7 @@ test_expect_success 'branch -d can delete symref with broken name' ' test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" && git branch -d broken...symref >output 2>error && test_path_is_missing .git/refs/heads/broken...symref && - test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output && + test_grep "Deleted branch broken...symref (was refs/heads/main)" output && test_must_be_empty error ' @@ -283,7 +283,7 @@ test_expect_success 'branch -d can delete dangling symref with broken name' ' test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" && git branch -d broken...symref >output 2>error && test_path_is_missing .git/refs/heads/broken...symref && - test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && + test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && test_must_be_empty error ' @@ -292,7 +292,7 @@ test_expect_success 'update-ref -d cannot delete non-ref in .git dir' ' echo precious >expect && test_must_fail git update-ref -d my-private-file >output 2>error && test_must_be_empty output && - test_i18ngrep -e "refusing to update ref with bad name" error && + test_grep -e "refusing to update ref with bad name" error && test_cmp expect .git/my-private-file ' diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 5805d47eb9..e2b30fb75e 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -118,7 +118,7 @@ test_expect_success 'branch pointing to non-commit' ' git rev-parse HEAD^{tree} >.git/refs/heads/invalid && test_when_finished "git update-ref -d refs/heads/invalid" && test_must_fail git fsck 2>out && - test_i18ngrep "not a commit" out + test_grep "not a commit" out ' test_expect_success 'HEAD link pointing at a funny object' ' @@ -127,7 +127,7 @@ test_expect_success 'HEAD link pointing at a funny object' ' echo $ZERO_OID >.git/HEAD && # avoid corrupt/broken HEAD from interfering with repo discovery test_must_fail env GIT_DIR=.git git fsck 2>out && - test_i18ngrep "detached HEAD points" out + test_grep "detached HEAD points" out ' test_expect_success 'HEAD link pointing at a funny place' ' @@ -136,7 +136,7 @@ test_expect_success 'HEAD link pointing at a funny place' ' echo "ref: refs/funny/place" >.git/HEAD && # avoid corrupt/broken HEAD from interfering with repo discovery test_must_fail env GIT_DIR=.git git fsck 2>out && - test_i18ngrep "HEAD points to something strange" out + test_grep "HEAD points to something strange" out ' test_expect_success 'HEAD link pointing at a funny object (from different wt)' ' @@ -147,7 +147,7 @@ test_expect_success 'HEAD link pointing at a funny object (from different wt)' ' echo $ZERO_OID >.git/HEAD && # avoid corrupt/broken HEAD from interfering with repo discovery test_must_fail git -C wt fsck 2>out && - test_i18ngrep "main-worktree/HEAD: detached HEAD points" out + test_grep "main-worktree/HEAD: detached HEAD points" out ' test_expect_success 'other worktree HEAD link pointing at a funny object' ' @@ -155,7 +155,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny object' ' git worktree add other && echo $ZERO_OID >.git/worktrees/other/HEAD && test_must_fail git fsck 2>out && - test_i18ngrep "worktrees/other/HEAD: detached HEAD points" out + test_grep "worktrees/other/HEAD: detached HEAD points" out ' test_expect_success 'other worktree HEAD link pointing at missing object' ' @@ -163,7 +163,7 @@ test_expect_success 'other worktree HEAD link pointing at missing object' ' git worktree add other && echo "Contents missing from repo" | git hash-object --stdin >.git/worktrees/other/HEAD && test_must_fail git fsck 2>out && - test_i18ngrep "worktrees/other/HEAD: invalid sha1 pointer" out + test_grep "worktrees/other/HEAD: invalid sha1 pointer" out ' test_expect_success 'other worktree HEAD link pointing at a funny place' ' @@ -171,7 +171,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' ' git worktree add other && echo "ref: refs/funny/place" >.git/worktrees/other/HEAD && test_must_fail git fsck 2>out && - test_i18ngrep "worktrees/other/HEAD points to something strange" out + test_grep "worktrees/other/HEAD points to something strange" out ' test_expect_success 'commit with multiple signatures is okay' ' @@ -217,7 +217,7 @@ test_expect_success 'email with embedded > is not okay' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new" out + test_grep "error in commit $new" out ' test_expect_success 'missing < email delimiter is reported nicely' ' @@ -228,7 +228,7 @@ test_expect_success 'missing < email delimiter is reported nicely' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new.* - bad name" out + test_grep "error in commit $new.* - bad name" out ' test_expect_success 'missing email is reported nicely' ' @@ -239,7 +239,7 @@ test_expect_success 'missing email is reported nicely' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new.* - missing email" out + test_grep "error in commit $new.* - missing email" out ' test_expect_success '> in name is reported' ' @@ -250,7 +250,7 @@ test_expect_success '> in name is reported' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new" out + test_grep "error in commit $new" out ' # date is 2^64 + 1 @@ -263,7 +263,7 @@ test_expect_success 'integer overflow in timestamps is reported' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new.*integer overflow" out + test_grep "error in commit $new.*integer overflow" out ' test_expect_success 'commit with NUL in header' ' @@ -274,7 +274,7 @@ test_expect_success 'commit with NUL in header' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $new.*unterminated header: NUL at offset" out + test_grep "error in commit $new.*unterminated header: NUL at offset" out ' test_expect_success 'tree object with duplicate entries' ' @@ -295,7 +295,7 @@ test_expect_success 'tree object with duplicate entries' ' git hash-object --literally -w -t tree --stdin ) && test_must_fail git fsck 2>out && - test_i18ngrep "error in tree .*contains duplicate file entries" out + test_grep "error in tree .*contains duplicate file entries" out ' check_duplicate_names () { @@ -318,8 +318,8 @@ check_duplicate_names () { done >badtree && badtree=$(git mktree <badtree) && test_must_fail git fsck 2>out && - test_i18ngrep "$badtree" out && - test_i18ngrep "error in tree .*contains duplicate file entries" out + test_grep "$badtree" out && + test_grep "error in tree .*contains duplicate file entries" out ' } @@ -341,9 +341,9 @@ test_expect_success 'unparseable tree object' ' commit_sha1=$(git commit-tree $tree_sha1) && git update-ref refs/heads/wrong $commit_sha1 && test_must_fail git fsck 2>out && - test_i18ngrep "error: empty filename in tree entry" out && - test_i18ngrep "$tree_sha1" out && - test_i18ngrep ! "fatal: empty filename in tree entry" out + test_grep "error: empty filename in tree entry" out && + test_grep "$tree_sha1" out && + test_grep ! "fatal: empty filename in tree entry" out ' test_expect_success 'tree entry with type mismatch' ' @@ -360,8 +360,8 @@ test_expect_success 'tree entry with type mismatch' ' commit=$(git commit-tree $tree) && git update-ref refs/heads/type_mismatch $commit && test_must_fail git fsck >out 2>&1 && - test_i18ngrep "is a blob, not a tree" out && - test_i18ngrep ! "dangling blob" out + test_grep "is a blob, not a tree" out && + test_grep ! "dangling blob" out ' test_expect_success 'tree entry with bogus mode' ' @@ -394,7 +394,7 @@ test_expect_success 'tag pointing to nonexistent' ' echo $tag >.git/refs/tags/invalid && test_when_finished "git update-ref -d refs/tags/invalid" && test_must_fail git fsck --tags >out && - test_i18ngrep "broken link" out + test_grep "broken link" out ' test_expect_success 'tag pointing to something else than its type' ' @@ -455,7 +455,7 @@ test_expect_success 'tag with bad tagger' ' echo $tag >.git/refs/tags/wrong && test_when_finished "git update-ref -d refs/tags/wrong" && test_must_fail git fsck --tags 2>out && - test_i18ngrep "error in tag .*: invalid author/committer" out + test_grep "error in tag .*: invalid author/committer" out ' test_expect_success 'tag with NUL in header' ' @@ -474,7 +474,7 @@ test_expect_success 'tag with NUL in header' ' echo $tag >.git/refs/tags/wrong && test_when_finished "git update-ref -d refs/tags/wrong" && test_must_fail git fsck --tags 2>out && - test_i18ngrep "error in tag $tag.*unterminated header: NUL at offset" out + test_grep "error in tag $tag.*unterminated header: NUL at offset" out ' test_expect_success 'cleaned up' ' @@ -504,7 +504,7 @@ test_expect_success 'rev-list --verify-objects with bad sha1' ' test_when_finished "git update-ref -d refs/heads/bogus" && test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out && - test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out + test_grep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out ' # An actual bit corruption is more likely than swapped commits, but @@ -575,7 +575,7 @@ test_expect_success 'fsck notices blob entry pointing to null sha1' ' sha=$(printf "100644 file$_bz$_bzoid" | git hash-object --literally -w --stdin -t tree) && git fsck 2>out && - test_i18ngrep "warning.*null sha1" out + test_grep "warning.*null sha1" out ) ' @@ -585,7 +585,7 @@ test_expect_success 'fsck notices submodule entry pointing to null sha1' ' sha=$(printf "160000 submodule$_bz$_bzoid" | git hash-object --literally -w --stdin -t tree) && git fsck 2>out && - test_i18ngrep "warning.*null sha1" out + test_grep "warning.*null sha1" out ) ' @@ -606,7 +606,7 @@ while read name path pretty; do printf "$mode $type %s\t%s" "$value" "$path" >bad && bad_tree=$(git mktree <bad) && git fsck 2>out && - test_i18ngrep "warning.*tree $bad_tree" out + test_grep "warning.*tree $bad_tree" out )' done <<-\EOF 100644 blob @@ -652,9 +652,9 @@ test_expect_success 'NUL in commit' ' git branch bad $(cat name) && test_must_fail git -c fsck.nulInCommit=error fsck 2>warn.1 && - test_i18ngrep nulInCommit warn.1 && + test_grep nulInCommit warn.1 && git fsck 2>warn.2 && - test_i18ngrep nulInCommit warn.2 + test_grep nulInCommit warn.2 ) ' @@ -774,7 +774,7 @@ test_expect_success 'fsck --name-objects' ' tree=$(git rev-parse --verify julius:) && git tag -d julius && test_must_fail git fsck --name-objects >out && - test_i18ngrep "$tree (refs/tags/augustus44\\^:" out + test_grep "$tree (refs/tags/augustus44\\^:" out ) ' @@ -787,7 +787,7 @@ test_expect_success 'alternate objects are correctly blamed' ' mkdir alt.git/objects/$(dirname $path) && >alt.git/objects/$(dirname $path)/$(basename $path) && test_must_fail git fsck >out 2>&1 && - test_i18ngrep alt.git out + test_grep alt.git out ' test_expect_success 'fsck errors in packed objects' ' @@ -806,8 +806,8 @@ test_expect_success 'fsck errors in packed objects' ' remove_object $one && remove_object $two && test_must_fail git fsck 2>out && - test_i18ngrep "error in commit $one.* - bad name" out && - test_i18ngrep "error in commit $two.* - bad name" out && + test_grep "error in commit $one.* - bad name" out && + test_grep "error in commit $two.* - bad name" out && ! grep corrupt out ' @@ -824,7 +824,7 @@ test_expect_success 'fsck fails on corrupt packfile' ' test_when_finished "rm -f .git/objects/pack/pack-$pack.*" && remove_object $hsh && test_must_fail git fsck 2>out && - test_i18ngrep "checksum mismatch" out + test_grep "checksum mismatch" out ' test_expect_success 'fsck finds problems in duplicate loose objects' ' @@ -861,7 +861,7 @@ test_expect_success 'fsck detects trailing loose garbage (commit)' ' chmod +w "$file" && echo garbage >>"$file" && test_must_fail git fsck 2>out && - test_i18ngrep "garbage.*$commit" out + test_grep "garbage.*$commit" out ' test_expect_success 'fsck detects trailing loose garbage (large blob)' ' @@ -871,7 +871,7 @@ test_expect_success 'fsck detects trailing loose garbage (large blob)' ' chmod +w "$file" && echo garbage >>"$file" && test_must_fail git -c core.bigfilethreshold=5 fsck 2>out && - test_i18ngrep "garbage.*$blob" out + test_grep "garbage.*$blob" out ' test_expect_success 'fsck detects truncated loose object' ' @@ -887,10 +887,10 @@ test_expect_success 'fsck detects truncated loose object' ' # check both regular and streaming code paths test_must_fail git fsck 2>out && - test_i18ngrep corrupt.*$blob out && + test_grep corrupt.*$blob out && test_must_fail git -c core.bigfilethreshold=128 fsck 2>out && - test_i18ngrep corrupt.*$blob out + test_grep corrupt.*$blob out ' # for each of type, we have one version which is referenced by another object @@ -979,7 +979,7 @@ test_expect_success 'detect corrupt index file in fsck' ' test_when_finished "mv .git/index.backup .git/index" && corrupt_index_checksum && test_must_fail git fsck --cache 2>errors && - test_i18ngrep "bad index file" errors + test_grep "bad index file" errors ' test_expect_success 'fsck error and recovery on invalid object type' ' diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index 18688cae17..ef40511d89 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -107,16 +107,16 @@ test_expect_success 'correct relative file objects (6)' ' test_expect_success 'incorrect revision id' ' test_must_fail git rev-parse foobar:file.txt 2>error && - test_i18ngrep "invalid object name .foobar." error && + test_grep "invalid object name .foobar." error && test_must_fail git rev-parse foobar 2>error && - test_i18ngrep "unknown revision or path not in the working tree." error + test_grep "unknown revision or path not in the working tree." error ' test_expect_success 'incorrect file in sha1:path' ' test_must_fail git rev-parse HEAD:nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error && + test_grep "path .nothing.txt. does not exist in .HEAD." error && test_must_fail git rev-parse HEAD:index-only.txt 2>error && - test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error && + test_grep "path .index-only.txt. exists on disk, but not in .HEAD." error && (cd subdir && test_must_fail git rev-parse HEAD:file2.txt 2>error && test_did_you_mean HEAD subdir/ file2.txt exists ) @@ -124,9 +124,9 @@ test_expect_success 'incorrect file in sha1:path' ' test_expect_success 'incorrect file in :path and :N:path' ' test_must_fail git rev-parse :nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && + test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && test_must_fail git rev-parse :1:nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && + test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && test_must_fail git rev-parse :1:file.txt 2>error && test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" && (cd subdir && @@ -137,42 +137,42 @@ test_expect_success 'incorrect file in :path and :N:path' ' test_must_fail git rev-parse :2:file2.txt 2>error && test_did_you_mean :0 subdir/ file2.txt "is in the index") && test_must_fail git rev-parse :disk-only.txt 2>error && - test_i18ngrep "path .disk-only.txt. exists on disk, but not in the index" error + test_grep "path .disk-only.txt. exists on disk, but not in the index" error ' test_expect_success 'invalid @{n} reference' ' test_must_fail git rev-parse main@{99999} >output 2>error && test_must_be_empty output && - test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error && + test_grep "log for [^ ]* only has [0-9][0-9]* entries" error && test_must_fail git rev-parse --verify main@{99999} >output 2>error && test_must_be_empty output && - test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error + test_grep "log for [^ ]* only has [0-9][0-9]* entries" error ' test_expect_success 'relative path not found' ' ( cd subdir && test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error && - test_i18ngrep subdir/nonexistent.txt error + test_grep subdir/nonexistent.txt error ) ' test_expect_success 'relative path outside worktree' ' test_must_fail git rev-parse HEAD:../file.txt >output 2>error && test_must_be_empty output && - test_i18ngrep "outside repository" error + test_grep "outside repository" error ' test_expect_success 'relative path when cwd is outside worktree' ' test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error && test_must_be_empty output && - test_i18ngrep "relative path syntax can.t be used outside working tree" error + test_grep "relative path syntax can.t be used outside working tree" error ' test_expect_success '<commit>:file correctly diagnosed after a pathname' ' test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error && - test_i18ngrep ! "exists on disk" error && - test_i18ngrep "no such path in the working tree" error && + test_grep ! "exists on disk" error && + test_grep "no such path in the working tree" error && cat >expect <<-\EOF && file.txt HEAD:file.txt @@ -214,13 +214,13 @@ test_expect_success 'dotdot does not peel endpoints' ' test_expect_success 'arg before dashdash must be a revision (missing)' ' test_must_fail git rev-parse foobar -- 2>stderr && - test_i18ngrep "bad revision" stderr + test_grep "bad revision" stderr ' test_expect_success 'arg before dashdash must be a revision (file)' ' >foobar && test_must_fail git rev-parse foobar -- 2>stderr && - test_i18ngrep "bad revision" stderr + test_grep "bad revision" stderr ' test_expect_success 'arg before dashdash must be a revision (ambiguous)' ' @@ -269,7 +269,7 @@ test_expect_success 'arg after dashdash not interpreted as option' ' test_expect_success 'arg after end-of-options not interpreted as option' ' test_must_fail git rev-parse --end-of-options --not-real -- 2>err && - test_i18ngrep bad.revision.*--not-real err + test_grep bad.revision.*--not-real err ' test_expect_success 'end-of-options still allows --' ' diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 98cefe3b70..70f1e0a998 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -129,7 +129,7 @@ test_expect_success 'blob and tree' ' test_expect_success 'warn ambiguity when no candidate matches type hint' ' test_must_fail git rev-parse --verify 000000000^{commit} 2>actual && - test_i18ngrep "short object ID 000000000 is ambiguous" actual + test_grep "short object ID 000000000 is ambiguous" actual ' test_expect_success 'disambiguate tree-ish' ' @@ -470,10 +470,10 @@ test_expect_success 'cat-file --batch and --batch-check show ambiguous' ' echo "0000 ambiguous" >expect && echo 0000 | git cat-file --batch-check >actual 2>err && test_cmp expect actual && - test_i18ngrep hint: err && + test_grep hint: err && echo 0000 | git cat-file --batch >actual 2>err && test_cmp expect actual && - test_i18ngrep hint: err + test_grep hint: err ' test_done diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh index b16d69ca4a..4c0fd856b3 100755 --- a/t/t2004-checkout-cache-temp.sh +++ b/t/t2004-checkout-cache-temp.sh @@ -93,7 +93,7 @@ test_expect_success 'checkout all stages of unknown path' ' rm -f path* .merge_* actual && test_must_fail git checkout-index --stage=all --temp \ -- does-not-exist 2>stderr && - test_i18ngrep not.in.the.cache stderr + test_grep not.in.the.cache stderr ' test_expect_success 'checkout all stages/one file to nothing' ' diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh index 5d119871d4..570ba38580 100755 --- a/t/t2006-checkout-index-basic.sh +++ b/t/t2006-checkout-index-basic.sh @@ -8,7 +8,7 @@ TEST_PASSES_SANITIZE_LEAK=true test_expect_success 'checkout-index --gobbledegook' ' test_expect_code 129 git checkout-index --gobbledegook 2>err && - test_i18ngrep "[Uu]sage" err + test_grep "[Uu]sage" err ' test_expect_success 'checkout-index -h in broken repository' ' @@ -19,18 +19,18 @@ test_expect_success 'checkout-index -h in broken repository' ' >.git/index && test_expect_code 129 git checkout-index -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + test_grep "[Uu]sage" broken/usage ' test_expect_success 'checkout-index reports errors (cmdline)' ' test_must_fail git checkout-index -- does-not-exist 2>stderr && - test_i18ngrep not.in.the.cache stderr + test_grep not.in.the.cache stderr ' test_expect_success 'checkout-index reports errors (stdin)' ' echo does-not-exist | test_must_fail git checkout-index --stdin 2>stderr && - test_i18ngrep not.in.the.cache stderr + test_grep not.in.the.cache stderr ' for mode in 'case' 'utf-8' do @@ -88,8 +88,8 @@ test_expect_success 'checkout-index --temp correctly reports error on missing bl git update-index --index-info <objs && test_must_fail git checkout-index --temp symlink file 2>stderr && - test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr && - test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr + test_grep "unable to read sha1 file of file ($missing_blob)" stderr && + test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr ' test_expect_success 'checkout-index --temp correctly reports error for submodules' ' @@ -98,7 +98,7 @@ test_expect_success 'checkout-index --temp correctly reports error for submodule git submodule add ./sub && git commit -m sub && test_must_fail git checkout-index --temp sub 2>stderr && - test_i18ngrep "cannot create temporary submodule sub" stderr + test_grep "cannot create temporary submodule sub" stderr ' test_done diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh index 9d4b37526a..82c3bfeac1 100755 --- a/t/t2010-checkout-ambiguous.sh +++ b/t/t2010-checkout-ambiguous.sh @@ -62,8 +62,8 @@ test_expect_success 'disambiguate checking out from a tree-ish' ' test_expect_success 'accurate error message with more than one ref' ' test_must_fail git checkout HEAD main -- 2>actual && - test_i18ngrep 2 actual && - test_i18ngrep "one reference expected, 2 given" actual + test_grep 2 actual && + test_grep "one reference expected, 2 given" actual ' test_done diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 8581ad3437..43551cc148 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -278,12 +278,12 @@ test_expect_success 'checkout -b to a new branch preserves mergeable changes des test_expect_success 'checkout -b rejects an invalid start point' ' test_must_fail git checkout -b branch4 file1 2>err && - test_i18ngrep "is not a commit" err + test_grep "is not a commit" err ' test_expect_success 'checkout -b rejects an extra path argument' ' test_must_fail git checkout -b branch5 branch1 file1 2>err && - test_i18ngrep "Cannot update paths and switch to branch" err + test_grep "Cannot update paths and switch to branch" err ' test_done diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 9540588664..c67261e2b6 100755 --- a/t/t2019-checkout-ambiguous-ref.sh +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -32,8 +32,8 @@ test_expect_success 'checkout chooses branch over tag' ' ' test_expect_success 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr + test_grep "Switched to branch" stderr && + test_grep ! "^HEAD is now at" stderr ' test_expect_success 'checkout vague ref succeeds' ' @@ -54,8 +54,8 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' ' test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr + test_grep "Switched to branch" stderr && + test_grep ! "^HEAD is now at" stderr ' test_done diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index 2eab6474f8..8202ef8c74 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -17,12 +17,12 @@ check_not_detached () { PREV_HEAD_DESC='Previous HEAD position was' check_orphan_warning() { - test_i18ngrep "you are leaving $2 behind" "$1" && - test_i18ngrep ! "$PREV_HEAD_DESC" "$1" + test_grep "you are leaving $2 behind" "$1" && + test_grep ! "$PREV_HEAD_DESC" "$1" } check_no_orphan_warning() { - test_i18ngrep ! "you are leaving .* commit.*behind" "$1" && - test_i18ngrep "$PREV_HEAD_DESC" "$1" + test_grep ! "you are leaving .* commit.*behind" "$1" && + test_grep "$PREV_HEAD_DESC" "$1" } reset () { diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index 74049a9812..a97416ce65 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -93,7 +93,7 @@ test_expect_success 'when arg matches multiple remotes, do not fallback to inter test_must_fail git checkout ambiguous_branch_and_file 2>err && - test_i18ngrep "matched multiple (2) remote tracking branches" err && + test_grep "matched multiple (2) remote tracking branches" err && # file must not be altered test_cmp expect ambiguous_branch_and_file @@ -105,12 +105,12 @@ test_expect_success 'checkout of branch from multiple remotes fails with advice' test_must_fail git checkout foo 2>stderr && test_branch main && status_uno_is_clean && - test_i18ngrep "^hint: " stderr && + test_grep "^hint: " stderr && test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \ checkout foo 2>stderr && test_branch main && status_uno_is_clean && - test_i18ngrep ! "^hint: " stderr + test_grep ! "^hint: " stderr ' test_expect_success PERL 'checkout -p with multiple remotes does not print advice' ' @@ -118,7 +118,7 @@ test_expect_success PERL 'checkout -p with multiple remotes does not print advic test_might_fail git branch -D foo && git checkout -p foo 2>stderr && - test_i18ngrep ! "^hint: " stderr && + test_grep ! "^hint: " stderr && status_uno_is_clean ' diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh index 3832c3de81..246609d54d 100755 --- a/t/t2025-checkout-no-overlay.sh +++ b/t/t2025-checkout-no-overlay.sh @@ -26,7 +26,7 @@ test_expect_success 'checkout --no-overlay removing last file from directory' ' test_expect_success 'checkout -p --overlay is disallowed' ' test_must_fail git checkout -p --overlay HEAD 2>actual && - test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual + test_grep "fatal: options .-p. and .--overlay. cannot be used together" actual ' test_expect_success '--no-overlay --theirs with D/F conflict deletes file' ' diff --git a/t/t2026-checkout-pathspec-file.sh b/t/t2026-checkout-pathspec-file.sh index 9c651aefbc..acd55217a6 100755 --- a/t/t2026-checkout-pathspec-file.sh +++ b/t/t2026-checkout-pathspec-file.sh @@ -149,16 +149,16 @@ test_expect_success 'error conditions' ' echo fileA.t >list && test_must_fail git checkout --pathspec-from-file=list --detach 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err && test_must_fail git checkout --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && + test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git checkout --pathspec-file-nul 2>err && - test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err + test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err ' test_done diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh index a8bbc60954..98f16c7239 100755 --- a/t/t2027-checkout-track.sh +++ b/t/t2027-checkout-track.sh @@ -22,7 +22,7 @@ test_expect_success 'checkout --track -b creates a new tracking branch' ' test_expect_success 'checkout --track -b rejects an extra path argument' ' test_must_fail git checkout --track -b branch2 main one.t 2>err && - test_i18ngrep "cannot be used with updating paths" err + test_grep "cannot be used with updating paths" err ' test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' ' diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh index 2d8c70b03a..102023ed57 100755 --- a/t/t2030-unresolve-info.sh +++ b/t/t2030-unresolve-info.sh @@ -191,7 +191,7 @@ test_expect_success 'rerere forget (add-add conflict)' ' git commit -m "add differently" && test_must_fail git merge fifth && git rerere forget add-differently 2>actual && - test_i18ngrep "no remembered" actual + test_grep "no remembered" actual ' test_expect_success 'resolve-undo keeps blobs from gc' ' diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh index c22669b39f..8198a1e578 100755 --- a/t/t2072-restore-pathspec-file.sh +++ b/t/t2072-restore-pathspec-file.sh @@ -152,16 +152,16 @@ test_expect_success 'error conditions' ' >empty_list && test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err && - test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && + test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err && - test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && + test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err && - test_i18ngrep -e "you must specify path(s) to restore" err + test_grep -e "you must specify path(s) to restore" err ' test_expect_success 'wildcard pathspec matches file in subdirectory' ' diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh index d943ddf47e..95c004dc5c 100755 --- a/t/t2106-update-index-assume-unchanged.sh +++ b/t/t2106-update-index-assume-unchanged.sh @@ -22,7 +22,7 @@ test_expect_success 'do not switch branches with dirty file' ' echo dirt >file && git update-index --assume-unchanged file && test_must_fail git checkout - 2>err && - test_i18ngrep overwritten err + test_grep overwritten err ' test_done diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 89b285fa3a..3d7ca5792e 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -14,7 +14,7 @@ test_expect_success 'update-index --nonsense fails' ' test_expect_success 'update-index --nonsense dumps usage' ' test_expect_code 129 git update-index --nonsense 2>err && - test_i18ngrep "[Uu]sage: git update-index" err + test_grep "[Uu]sage: git update-index" err ' test_expect_success 'update-index -h with corrupt index' ' @@ -25,7 +25,7 @@ test_expect_success 'update-index -h with corrupt index' ' >.git/index && test_expect_code 129 git update-index -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage: git update-index" broken/usage + test_grep "[Uu]sage: git update-index" broken/usage ' test_expect_success '--cacheinfo complains of missing arguments' ' diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index ebf58db2d1..8fa44a92a2 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -173,7 +173,7 @@ test_expect_success 'rename detection finds the right names' ' git add -N third && git status | grep -v "^?" >actual.1 && - test_i18ngrep "renamed: *first -> third" actual.1 && + test_grep "renamed: *first -> third" actual.1 && git status --porcelain | grep -v "^?" >actual.2 && cat >expected.2 <<-\EOF && @@ -213,8 +213,8 @@ test_expect_success 'double rename detection in status' ' git add -N third && git status | grep -v "^?" >actual.1 && - test_i18ngrep "renamed: *first -> second" actual.1 && - test_i18ngrep "renamed: *second -> third" actual.1 && + test_grep "renamed: *first -> second" actual.1 && + test_grep "renamed: *second -> third" actual.1 && git status --porcelain | grep -v "^?" >actual.2 && cat >expected.2 <<-\EOF && diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh index 89424abccd..b7cf1e492c 100755 --- a/t/t2204-add-ignored.sh +++ b/t/t2204-add-ignored.sh @@ -36,7 +36,7 @@ do ' test_expect_success "complaints for ignored $i output" ' - test_i18ngrep -e "Use -f if" err + test_grep -e "Use -f if" err ' test_expect_success "complaints for ignored $i with unignored file" ' @@ -46,7 +46,7 @@ do test_must_be_empty out ' test_expect_success "complaints for ignored $i with unignored file output" ' - test_i18ngrep -e "Use -f if" err + test_grep -e "Use -f if" err ' done @@ -65,7 +65,7 @@ do test_expect_success "complaints for ignored $i in dir output" ' ( cd dir && - test_i18ngrep -e "Use -f if" err + test_grep -e "Use -f if" err ) ' done @@ -85,7 +85,7 @@ do test_expect_success "complaints for ignored $i in sub output" ' ( cd sub && - test_i18ngrep -e "Use -f if" err + test_grep -e "Use -f if" err ) ' done diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh index 568a47ec42..71aa9bcd62 100755 --- a/t/t2401-worktree-prune.sh +++ b/t/t2401-worktree-prune.sh @@ -47,7 +47,7 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' ' : >.git/worktrees/def/gitdir && chmod u-r .git/worktrees/def/gitdir && git worktree prune --verbose 2>actual && - test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual && + test_grep "Removing worktrees/def: unable to read gitdir file" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -57,7 +57,7 @@ test_expect_success 'prune directories with invalid gitdir' ' : >.git/worktrees/def/def && : >.git/worktrees/def/gitdir && git worktree prune --verbose 2>actual && - test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual && + test_grep "Removing worktrees/def: invalid gitdir file" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -67,7 +67,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' ' : >.git/worktrees/def/def && echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir && git worktree prune --verbose 2>actual && - test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual && + test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual && ! test -d .git/worktrees/def && ! test -d .git/worktrees ' @@ -103,7 +103,7 @@ test_expect_success 'prune duplicate (linked/linked)' ' sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new && mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir && git worktree prune --verbose 2>actual && - test_i18ngrep "duplicate entry" actual && + test_grep "duplicate entry" actual && test -d .git/worktrees/w1 && ! test -d .git/worktrees/w2 ' @@ -116,7 +116,7 @@ test_expect_success 'prune duplicate (main/linked)' ' rm -fr wt && mv repo wt && git -C wt worktree prune --verbose 2>actual && - test_i18ngrep "duplicate entry" actual && + test_grep "duplicate entry" actual && ! test -d .git/worktrees/wt ' diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh index 9ad9be0c20..33ea9cb21b 100755 --- a/t/t2402-worktree-list.sh +++ b/t/t2402-worktree-list.sh @@ -143,7 +143,7 @@ test_expect_success '"list" all worktrees --porcelain with prunable' ' rm -rf prunable && git worktree list --porcelain >out && sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable && - test_i18ngrep "^prunable gitdir file points to non-existent location$" only_prunable + test_grep "^prunable gitdir file points to non-existent location$" only_prunable ' test_expect_success '"list" all worktrees with prunable consistent with "prune"' ' @@ -155,8 +155,8 @@ test_expect_success '"list" all worktrees with prunable consistent with "prune"' grep "/prunable *[0-9a-f].* prunable$" out && ! grep "/unprunable *[0-9a-f].* unprunable$" out && git worktree prune --verbose 2>out && - test_i18ngrep "^Removing worktrees/prunable" out && - test_i18ngrep ! "^Removing worktrees/unprunable" out + test_grep "^Removing worktrees/prunable" out && + test_grep ! "^Removing worktrees/unprunable" out ' test_expect_success '"list" --verbose and --porcelain mutually exclusive' ' diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh index 230a55e99a..901342ea09 100755 --- a/t/t2403-worktree-move.sh +++ b/t/t2403-worktree-move.sh @@ -202,7 +202,7 @@ test_expect_success 'proper error when worktree not found' ' for i in noodle noodle/bork do test_must_fail git worktree lock $i 2>err && - test_i18ngrep "not a working tree" err || return 1 + test_grep "not a working tree" err || return 1 done ' diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh index 8970780efc..edbf502ec5 100755 --- a/t/t2406-worktree-repair.sh +++ b/t/t2406-worktree-repair.sh @@ -25,7 +25,7 @@ test_expect_success 'worktree path not directory' ' >notdir && test_must_fail git worktree repair >out 2>err && test_must_be_empty out && - test_i18ngrep "not a directory" err + test_grep "not a directory" err ' test_expect_success "don't clobber .git repo" ' @@ -35,7 +35,7 @@ test_expect_success "don't clobber .git repo" ' test_create_repo repo && test_must_fail git worktree repair >out 2>err && test_must_be_empty out && - test_i18ngrep ".git is not a file" err + test_grep ".git is not a file" err ' test_corrupt_gitfile () { @@ -47,7 +47,7 @@ test_corrupt_gitfile () { git -C corrupt rev-parse --absolute-git-dir >expect && eval "$butcher" && git -C "$repairdir" worktree repair 2>err && - test_i18ngrep "$problem" err && + test_grep "$problem" err && git -C corrupt rev-parse --absolute-git-dir >actual && test_cmp expect actual } @@ -93,7 +93,7 @@ test_expect_success 'repair .git file from bare.git' ' test_expect_success 'invalid worktree path' ' test_must_fail git worktree repair /notvalid >out 2>err && test_must_be_empty out && - test_i18ngrep "not a valid path" err + test_grep "not a valid path" err ' test_expect_success 'repo not found; .git not file' ' @@ -101,7 +101,7 @@ test_expect_success 'repo not found; .git not file' ' test_create_repo not-a-worktree && test_must_fail git worktree repair not-a-worktree >out 2>err && test_must_be_empty out && - test_i18ngrep ".git is not a file" err + test_grep ".git is not a file" err ' test_expect_success 'repo not found; .git not referencing repo' ' @@ -111,7 +111,7 @@ test_expect_success 'repo not found; .git not referencing repo' ' mv side/.newgit side/.git && mkdir not-a-repo && test_must_fail git worktree repair side 2>err && - test_i18ngrep ".git file does not reference a repository" err + test_grep ".git file does not reference a repository" err ' test_expect_success 'repo not found; .git file broken' ' @@ -121,7 +121,7 @@ test_expect_success 'repo not found; .git file broken' ' mv orig moved && test_must_fail git worktree repair moved >out 2>err && test_must_be_empty out && - test_i18ngrep ".git file broken" err + test_grep ".git file broken" err ' test_expect_success 'repair broken gitdir' ' @@ -132,7 +132,7 @@ test_expect_success 'repair broken gitdir' ' mv orig moved && git worktree repair moved 2>err && test_cmp expect .git/worktrees/orig/gitdir && - test_i18ngrep "gitdir unreadable" err + test_grep "gitdir unreadable" err ' test_expect_success 'repair incorrect gitdir' ' @@ -142,7 +142,7 @@ test_expect_success 'repair incorrect gitdir' ' mv orig moved && git worktree repair moved 2>err && test_cmp expect .git/worktrees/orig/gitdir && - test_i18ngrep "gitdir incorrect" err + test_grep "gitdir incorrect" err ' test_expect_success 'repair gitdir (implicit) from linked worktree' ' @@ -152,7 +152,7 @@ test_expect_success 'repair gitdir (implicit) from linked worktree' ' mv orig moved && git -C moved worktree repair 2>err && test_cmp expect .git/worktrees/orig/gitdir && - test_i18ngrep "gitdir incorrect" err + test_grep "gitdir incorrect" err ' test_expect_success 'unable to repair gitdir (implicit) from main worktree' ' @@ -177,8 +177,8 @@ test_expect_success 'repair multiple gitdir files' ' git worktree repair moved1 moved2 2>err && test_cmp expect1 .git/worktrees/orig1/gitdir && test_cmp expect2 .git/worktrees/orig2/gitdir && - test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" err && - test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" err + test_grep "gitdir incorrect:.*orig1/gitdir$" err && + test_grep "gitdir incorrect:.*orig2/gitdir$" err ' test_expect_success 'repair moved main and linked worktrees' ' diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh index a16e25c79b..12e41a7b40 100755 --- a/t/t3004-ls-files-basic.sh +++ b/t/t3004-ls-files-basic.sh @@ -21,7 +21,7 @@ test_expect_success 'ls-files with nonexistent path' ' test_expect_success 'ls-files with nonsense option' ' test_expect_code 129 git ls-files --nonsense 2>actual && - test_i18ngrep "[Uu]sage: git ls-files" actual + test_grep "[Uu]sage: git ls-files" actual ' test_expect_success 'ls-files -h in corrupt repository' ' @@ -32,7 +32,7 @@ test_expect_success 'ls-files -h in corrupt repository' ' >.git/index && test_expect_code 129 git ls-files -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage: git ls-files " broken/usage + test_grep "[Uu]sage: git ls-files " broken/usage ' test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' ' diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh index 7308a3d4e2..61771eec83 100755 --- a/t/t3007-ls-files-recurse-submodules.sh +++ b/t/t3007-ls-files-recurse-submodules.sh @@ -296,7 +296,7 @@ test_expect_success '--recurse-submodules and relative paths' ' test_expect_success '--recurse-submodules does not support --error-unmatch' ' test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual && - test_i18ngrep "does not support --error-unmatch" actual + test_grep "does not support --error-unmatch" actual ' test_expect_success '--recurse-submodules parses submodule repo config' ' @@ -335,7 +335,7 @@ test_expect_success '--recurse-submodules submodules ignore super project worktr test_incompatible_with_recurse_submodules () { test_expect_success "--recurse-submodules and $1 are incompatible" " test_must_fail git ls-files --recurse-submodules $1 2>actual && - test_i18ngrep 'unsupported mode' actual + test_grep 'unsupported mode' actual " } diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index daf1666df7..649d9dcba5 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -36,7 +36,7 @@ test_expect_success 'branch -h in broken repository' ' >.git/refs/heads/main && test_expect_code 129 git branch -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage" broken/usage + test_grep "[Uu]sage" broken/usage ' test_expect_success 'git branch abc should create a branch' ' @@ -103,7 +103,7 @@ test_expect_success 'git branch l should work after branch l/m has been deleted' test_expect_success 'git branch -m dumps usage' ' test_expect_code 128 git branch -m 2>err && - test_i18ngrep "branch name required" err + test_grep "branch name required" err ' test_expect_success 'git branch -m m broken_symref should work' ' @@ -581,12 +581,12 @@ EOF test_expect_success 'git branch -c dumps usage' ' test_expect_code 128 git branch -c 2>err && - test_i18ngrep "branch name required" err + test_grep "branch name required" err ' test_expect_success 'git branch --copy dumps usage' ' test_expect_code 128 git branch --copy 2>err && - test_i18ngrep "branch name required" err + test_grep "branch name required" err ' test_expect_success 'git branch -c d e should work' ' @@ -1025,7 +1025,7 @@ test_expect_success '--set-upstream-to fails on a missing dst branch' ' test_expect_success '--set-upstream-to fails on a missing src branch' ' test_must_fail git branch --set-upstream-to does-not-exist main 2>err && - test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err + test_grep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err ' test_expect_success '--set-upstream-to fails on a non-ref' ' @@ -1039,7 +1039,7 @@ test_expect_success '--set-upstream-to fails on locked config' ' >.git/config.lock && git branch locked && test_must_fail git branch --set-upstream-to locked 2>err && - test_i18ngrep "could not lock config file .git/config" err + test_grep "could not lock config file .git/config" err ' test_expect_success 'use --set-upstream-to modify HEAD' ' @@ -1070,7 +1070,7 @@ test_expect_success '--unset-upstream should fail if config is locked' ' git branch --set-upstream-to locked && >.git/config.lock && test_must_fail git branch --unset-upstream 2>err && - test_i18ngrep "could not lock config file .git/config" err + test_grep "could not lock config file .git/config" err ' test_expect_success 'test --unset-upstream on HEAD' ' @@ -1506,7 +1506,7 @@ test_expect_success '--list during rebase' ' set_fake_editor && git rebase -i HEAD~2 && git branch --list >actual && - test_i18ngrep "rebasing main" actual + test_grep "rebasing main" actual ' test_expect_success '--list during rebase from detached HEAD' ' @@ -1518,7 +1518,7 @@ test_expect_success '--list during rebase from detached HEAD' ' set_fake_editor && git rebase -i HEAD~2 && git branch --list >actual && - test_i18ngrep "rebasing detached HEAD $oid" actual + test_grep "rebasing detached HEAD $oid" actual ' test_expect_success 'tracking with unexpected .fetch refspec' ' diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh index b17f388f56..235c68fb02 100755 --- a/t/t3202-show-branch.sh +++ b/t/t3202-show-branch.sh @@ -253,7 +253,7 @@ test_expect_success 'error descriptions on orphan branch' ' test_branch_op_in_wt() { test_orphan_error() { test_must_fail git $* 2>actual && - test_i18ngrep "No commit on branch .orphan-branch. yet.$" actual + test_grep "No commit on branch .orphan-branch. yet.$" actual } && test_orphan_error -C wt branch $1 $2 && # implicit branch test_orphan_error -C wt branch $1 orphan-branch $2 && # explicit branch diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index b5f4d6a653..cfeb8c84b0 100755 --- 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-* && diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh index 7326adb70f..7f4e98db7d 100755 --- a/t/t3210-pack-refs.sh +++ b/t/t3210-pack-refs.sh @@ -227,7 +227,7 @@ test_expect_success 'notice d/f conflict with existing directory' ' test_expect_success 'existing directory reports concrete ref' ' test_must_fail git branch foo 2>stderr && - test_i18ngrep refs/heads/foo/bar/baz stderr + test_grep refs/heads/foo/bar/baz stderr ' test_expect_success 'notice d/f conflict with existing ref' ' diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index d734000d2f..cf23c06c09 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -1469,9 +1469,9 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' ' test_expect_success 'git notes copy diagnoses too many or too few arguments' ' test_must_fail git notes copy 2>error && - test_i18ngrep "too few arguments" error && + test_grep "too few arguments" error && test_must_fail git notes copy one two three 2>error && - test_i18ngrep "too many arguments" error + test_grep "too many arguments" error ' test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' ' diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index d3d72e25fe..60d6ed2dc8 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -216,7 +216,7 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C git config core.notesRef refs/notes/m && test_must_fail git notes merge z >output 2>&1 && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + test_grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -263,7 +263,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish test -d .git/NOTES_MERGE_WORKTREE && test_must_fail git notes merge z >output 2>&1 && # Output should indicate what is wrong - test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output + test_grep -q "\\.git/NOTES_MERGE_\\* exists" output ' # Setup non-conflicting merge between x and new notes ref w @@ -417,7 +417,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol git config core.notesRef refs/notes/m && test_must_fail git notes merge z >output 2>&1 && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + test_grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -449,7 +449,7 @@ git rev-parse refs/notes/z > pre_merge_z test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' ' test_must_fail git notes merge z >output 2>&1 && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + test_grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -528,7 +528,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol git update-ref refs/notes/m refs/notes/y && test_must_fail git notes merge z >output 2>&1 && # Output should point to where to resolve conflicts - test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output && + test_grep "\\.git/NOTES_MERGE_WORKTREE" output && # Inspect merge conflicts ls .git/NOTES_MERGE_WORKTREE >output_conflicts && test_cmp expect_conflicts output_conflicts && @@ -573,9 +573,9 @@ EOF test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" && test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" && # Mention refs/notes/m, and its current and expected value in output - test_i18ngrep -q "refs/notes/m" output && - test_i18ngrep -q "$(git rev-parse refs/notes/m)" output && - test_i18ngrep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output && + test_grep -q "refs/notes/m" output && + test_grep -q "$(git rev-parse refs/notes/m)" output && + test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output && # Verify that other notes refs has not changed (w, x, y and z) verify_notes w && verify_notes x && diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index bff0aea550..0fd33280cf 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -57,7 +57,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' cd worktree && git config core.notesRef refs/notes/y && test_must_fail git notes merge z 2>err && - test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err + test_grep "a notes merge into refs/notes/y is already in-progress at" err ) && test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF ' @@ -67,7 +67,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' cd worktree2 && git config core.notesRef refs/notes/x && test_must_fail git notes merge z >out 2>&1 && - test_i18ngrep "Automatic notes merge failed" out && + test_grep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && echo "refs/notes/x" >expect && diff --git a/t/t3321-notes-stripspace.sh b/t/t3321-notes-stripspace.sh index 028d825e8f..33c1322989 100755 --- a/t/t3321-notes-stripspace.sh +++ b/t/t3321-notes-stripspace.sh @@ -428,7 +428,7 @@ test_expect_success 'add notes with empty messages' ' git notes add -m "${LF}" \ -m "${MULTI_LF}" \ -m "${LF}" >actual 2>&1 && - test_i18ngrep "Removing note for object" actual + test_grep "Removing note for object" actual ' test_expect_success 'add note by specifying "-C", "--no-stripspace" is the default behavior' ' diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 3ce918fdb8..621c8ef84c 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -143,8 +143,8 @@ test_expect_success 'Show verbose error when HEAD could not be detached' ' >B && test_when_finished "rm -f B" && test_must_fail git rebase topic 2>output.err >output.out && - test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err && - test_i18ngrep B output.err + test_grep "The following untracked working tree files would be overwritten by checkout:" output.err && + test_grep B output.err ' test_expect_success 'fail when upstream arg is missing and not on branch' ' @@ -421,7 +421,7 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' ' git checkout main && git worktree add wt && test_must_fail git -C wt rebase main main 2>err && - test_i18ngrep "already checked out" err + test_grep "already checked out" err ' test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' ' diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index e9e03ca4b5..5c67d07ba3 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -171,7 +171,7 @@ test_expect_success '--reapply-cherry-picks' ' # Regular rebase fails, because the 1-11 commit is deduplicated test_must_fail git -C repo rebase --merge main 2> err && - test_i18ngrep "error: could not apply.*add 12 in another branch" err && + test_grep "error: could not apply.*add 12 in another branch" err && git -C repo rebase --abort && # With --reapply-cherry-picks, it works diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index f6e4864497..a1911c4a9d 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -108,10 +108,10 @@ test_expect_success 'correct advice upon picking empty commit' ' test_when_finished "git rebase --abort" && test_must_fail git rebase -i --onto goodbye \ amended-goodbye^ amended-goodbye 2>err && - test_i18ngrep "previous cherry-pick is now empty" err && - test_i18ngrep "git rebase --skip" err && + test_grep "previous cherry-pick is now empty" err && + test_grep "git rebase --skip" err && test_must_fail git commit && - test_i18ngrep "git rebase --skip" err + test_grep "git rebase --skip" err ' test_expect_success 'correct authorship when committing empty pick' ' @@ -131,10 +131,10 @@ test_expect_success 'correct advice upon rewording empty commit' ' test_must_fail env FAKE_LINES="reword 1" git rebase -i \ --onto goodbye amended-goodbye^ amended-goodbye 2>err ) && - test_i18ngrep "previous cherry-pick is now empty" err && - test_i18ngrep "git rebase --skip" err && + test_grep "previous cherry-pick is now empty" err && + test_grep "git rebase --skip" err && test_must_fail git commit && - test_i18ngrep "git rebase --skip" err + test_grep "git rebase --skip" err ' test_expect_success 'correct advice upon editing empty commit' ' @@ -144,10 +144,10 @@ test_expect_success 'correct advice upon editing empty commit' ' test_must_fail env FAKE_LINES="edit 1" git rebase -i \ --onto goodbye amended-goodbye^ amended-goodbye 2>err ) && - test_i18ngrep "previous cherry-pick is now empty" err && - test_i18ngrep "git rebase --skip" err && + test_grep "previous cherry-pick is now empty" err && + test_grep "git rebase --skip" err && test_must_fail git commit && - test_i18ngrep "git rebase --skip" err + test_grep "git rebase --skip" err ' test_expect_success 'correct advice upon cherry-picking an empty commit during a rebase' ' @@ -157,10 +157,10 @@ test_expect_success 'correct advice upon cherry-picking an empty commit during a test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \ git rebase -i goodbye^ goodbye 2>err ) && - test_i18ngrep "previous cherry-pick is now empty" err && - test_i18ngrep "git cherry-pick --skip" err && + test_grep "previous cherry-pick is now empty" err && + test_grep "git cherry-pick --skip" err && test_must_fail git commit 2>err && - test_i18ngrep "git cherry-pick --skip" err + test_grep "git cherry-pick --skip" err ' test_expect_success 'correct advice upon multi cherry-pick picking an empty commit during a rebase' ' @@ -170,10 +170,10 @@ test_expect_success 'correct advice upon multi cherry-pick picking an empty comm test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \ git rebase -i goodbye^^ goodbye 2>err ) && - test_i18ngrep "previous cherry-pick is now empty" err && - test_i18ngrep "git cherry-pick --skip" err && + test_grep "previous cherry-pick is now empty" err && + test_grep "git cherry-pick --skip" err && test_must_fail git commit 2>err && - test_i18ngrep "git cherry-pick --skip" err + test_grep "git cherry-pick --skip" err ' test_expect_success 'fixup that empties commit fails' ' diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 96a56aafbe..dbd5df5aa4 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -291,9 +291,9 @@ test_expect_success 'abort with error when new base cannot be checked out' ' git rm --cached file1 && git commit -m "remove file in base" && test_must_fail git rebase -i primary > output 2>&1 && - test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \ + test_grep "The following untracked working tree files would be overwritten by checkout:" \ output && - test_i18ngrep "file1" output && + test_grep "file1" output && test_path_is_missing .git/rebase-merge && rm file1 && git reset --hard HEAD^ @@ -604,7 +604,7 @@ test_expect_success 'clean error after failed "exec"' ' echo "edited again" > file7 && git add file7 && test_must_fail git rebase --continue 2>error && - test_i18ngrep "you have staged changes in your working tree" error + test_grep "you have staged changes in your working tree" error ' test_expect_success 'rebase a detached HEAD' ' @@ -955,7 +955,7 @@ test_expect_success 'rebase --exec works without -i ' ' git reset --hard execute && rm -rf exec_output && EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual && - test_i18ngrep "Successfully rebased and updated" actual && + test_grep "Successfully rebased and updated" actual && test_line_count = 2 exec_output && test_path_is_missing invoked_editor ' @@ -963,7 +963,7 @@ test_expect_success 'rebase --exec works without -i ' ' test_expect_success 'rebase -i --exec without <CMD>' ' git reset --hard execute && test_must_fail git rebase -i --exec 2>actual && - test_i18ngrep "requires a value" actual && + test_grep "requires a value" actual && git checkout primary ' @@ -1272,7 +1272,7 @@ test_expect_success 'todo count' ' test_set_editor "$(pwd)/dump-raw.sh" && git rebase -i HEAD~4 >actual ) && - test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual + test_grep "^# Rebase ..* onto ..* ([0-9]" actual ' test_expect_success 'rebase -i commits that overwrite untracked files (pick)' ' @@ -1379,7 +1379,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' ' FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual ) && test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ + test_grep \ "Successfully rebased and updated refs/heads/missing-commit" \ actual ' @@ -1442,7 +1442,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ig git rebase --continue 2>actual ) && test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ + test_grep \ "Successfully rebased and updated refs/heads/missing-commit" \ actual ' @@ -1477,7 +1477,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa git rebase --continue 2>actual ) && test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ + test_grep \ "Successfully rebased and updated refs/heads/missing-commit" \ actual ' @@ -1525,7 +1525,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = er git rebase --continue 2>actual ) && test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ + test_grep \ "Successfully rebased and updated refs/heads/missing-commit" \ actual ' @@ -1585,9 +1585,9 @@ test_expect_success 'static check of bad command' ' set_fake_editor && test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ git rebase -i --root 2>actual && - test_i18ngrep "pickled $(git rev-list --oneline -1 primary~1)" \ + test_grep "pickled $(git rev-list --oneline -1 primary~1)" \ actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ + test_grep "You can fix this with .git rebase --edit-todo.." \ actual && FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo ) && @@ -1645,8 +1645,8 @@ test_expect_success 'static check of bad SHA-1' ' set_fake_editor && test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ git rebase -i --root 2>actual && - test_i18ngrep "edit XXXXXXX False commit" actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ + test_grep "edit XXXXXXX False commit" actual && + test_grep "You can fix this with .git rebase --edit-todo.." \ actual && FAKE_LINES="1 2 4 5 6" git rebase --edit-todo ) && @@ -1673,7 +1673,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' ' FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \ HEAD^ >out 2>err ) && - test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err + test_grep "$SQ-S\"S I Gner\"$SQ" err ' test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' ' @@ -1684,7 +1684,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' ' FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \ HEAD^ >out 2>err ) && - test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err + test_grep "$SQ-S\"S I Gner\"$SQ" err ' test_expect_success 'valid author header after --root swap' ' @@ -1738,7 +1738,7 @@ test_expect_success 'correct error message for partial commit after empty pick' ) && echo x >file1 && test_must_fail git commit file1 2>err && - test_i18ngrep "cannot do a partial commit during a rebase." err + test_grep "cannot do a partial commit during a rebase." err ' test_expect_success 'correct error message for commit --amend after empty pick' ' @@ -1751,13 +1751,13 @@ test_expect_success 'correct error message for commit --amend after empty pick' ) && echo x>file1 && test_must_fail git commit -a --amend 2>err && - test_i18ngrep "middle of a rebase -- cannot amend." err + test_grep "middle of a rebase -- cannot amend." err ' test_expect_success 'todo has correct onto hash' ' GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual && onto=$(git rev-parse --short HEAD~4) && - test_i18ngrep "^# Rebase ..* onto $onto" actual + test_grep "^# Rebase ..* onto $onto" actual ' test_expect_success 'ORIG_HEAD is updated correctly' ' diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index ceca160005..a1d7fa7f7c 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -33,24 +33,24 @@ test_expect_success 'rebase -m' ' test_expect_success 'rebase against main twice' ' git rebase --apply main >out && - test_i18ngrep "Current branch topic is up to date" out + test_grep "Current branch topic is up to date" out ' test_expect_success 'rebase against main twice with --force' ' git rebase --force-rebase --apply main >out && - test_i18ngrep "Current branch topic is up to date, rebase forced" out + test_grep "Current branch topic is up to date, rebase forced" out ' test_expect_success 'rebase against main twice from another branch' ' git checkout topic^ && git rebase --apply main topic >out && - test_i18ngrep "Current branch topic is up to date" out + test_grep "Current branch topic is up to date" out ' test_expect_success 'rebase fast-forward to main' ' git checkout topic^ && git rebase --apply topic >out && - test_i18ngrep "Fast-forwarded HEAD to topic" out + test_grep "Fast-forwarded HEAD to topic" out ' test_expect_success 'rebase --stat' ' @@ -75,14 +75,14 @@ test_expect_success 'rebase -n overrides config rebase.stat config' ' test_expect_success 'rebase --onto outputs the invalid ref' ' test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && - test_i18ngrep "invalid-ref" err + test_grep "invalid-ref" err ' test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' ' test_must_fail git rebase -Cnot-a-number HEAD 2>err && - test_i18ngrep "numerical value" err && + test_grep "numerical value" err && test_must_fail git rebase --whitespace=bad HEAD 2>err && - test_i18ngrep "Invalid whitespace option" err + test_grep "Invalid whitespace option" err ' write_reflog_expect () { @@ -251,8 +251,8 @@ test_expect_success 'rebase -i onto unrelated history' ' git -C unrelated remote add -f origin "$PWD" && git -C unrelated branch --set-upstream-to=origin/main && git -C unrelated -c core.editor=true rebase -i -v --stat >actual && - test_i18ngrep "Changes to " actual && - test_i18ngrep "5 files changed" actual + test_grep "Changes to " actual && + test_grep "5 files changed" actual ' test_done diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index fb7b68990c..108d5c28fa 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -182,8 +182,8 @@ test_expect_success '--skip after failed fixup cleans commit message' ' : Final squash failed, but there was still a squash && head -n1 .git/copy.txt >first-line && - test_i18ngrep "# This is a combination of 3 commits" first-line && - test_i18ngrep "# This is the commit message #3:" .git/copy.txt + test_grep "# This is a combination of 3 commits" first-line && + test_grep "# This is the commit message #3:" .git/copy.txt ' test_expect_success 'setup rerere database' ' @@ -276,7 +276,7 @@ test_expect_success '--reschedule-failed-exec' ' test_must_fail git -c rebase.rescheduleFailedExec=true \ rebase -x false HEAD^ 2>err && grep "^exec false" .git/rebase-merge/git-rebase-todo && - test_i18ngrep "has been rescheduled" err + test_grep "has been rescheduled" err ' test_expect_success 'rebase.rescheduleFailedExec only affects `rebase -i`' ' diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh index 4bfc779bb8..0bb284d61d 100755 --- a/t/t3431-rebase-fork-point.sh +++ b/t/t3431-rebase-fork-point.sh @@ -84,7 +84,7 @@ test_expect_success 'git rebase --fork-point with ambigous refname' ' test_expect_success '--fork-point and --root both given' ' test_must_fail git rebase --fork-point --root 2>err && - test_i18ngrep "cannot be used together" err + test_grep "cannot be used together" err ' test_expect_success 'rebase.forkPoint set to false' ' diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index e2ef619323..3eac20c098 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -43,7 +43,7 @@ test_expect_success 'cherry-pick --nonsense' ' git diff --exit-code HEAD && test_must_fail git cherry-pick --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep "[Uu]sage:" msg + test_grep "[Uu]sage:" msg ' test_expect_success 'revert --nonsense' ' @@ -52,7 +52,7 @@ test_expect_success 'revert --nonsense' ' git diff --exit-code HEAD && test_must_fail git revert --nonsense 2>msg && git diff --exit-code HEAD "$pos" && - test_i18ngrep "[Uu]sage:" msg + test_grep "[Uu]sage:" msg ' # the following two test cherry-pick and revert with renames @@ -99,7 +99,7 @@ test_expect_success 'revert forbidden on dirty working tree' ' echo content >extra_file && git add extra_file && test_must_fail git revert HEAD 2>errors && - test_i18ngrep "your local changes would be overwritten by " errors + test_grep "your local changes would be overwritten by " errors ' diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index f32799e046..c88d597b12 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -177,7 +177,7 @@ test_expect_success 'partial commit of cherry-pick fails' ' git add foo && test_must_fail git commit foo 2>err && - test_i18ngrep "cannot do a partial commit during a cherry-pick." err + test_grep "cannot do a partial commit during a cherry-pick." err ' test_expect_success 'commit --amend of cherry-pick fails' ' @@ -188,7 +188,7 @@ test_expect_success 'commit --amend of cherry-pick fails' ' git add foo && test_must_fail git commit --amend 2>err && - test_i18ngrep "in the middle of a cherry-pick -- cannot amend." err + test_grep "in the middle of a cherry-pick -- cannot amend." err ' test_expect_success 'successful final commit clears cherry-pick state' ' @@ -498,7 +498,7 @@ test_expect_success \ test_expect_success 'failed cherry-pick does not forget -s' ' pristine_detach initial && test_must_fail git cherry-pick -s picked && - test_i18ngrep -e "Signed-off-by" .git/MERGE_MSG + test_grep -e "Signed-off-by" .git/MERGE_MSG ' test_expect_success 'commit after failed cherry-pick does not add duplicated -s' ' @@ -563,7 +563,7 @@ test_expect_success 'cherry-pick preserves sparse-checkout' ' echo /unrelated >.git/info/sparse-checkout && git read-tree --reset -u HEAD && test_must_fail git cherry-pick -Xours picked>actual && - test_i18ngrep ! "Changes not staged for commit:" actual + test_grep ! "Changes not staged for commit:" actual ' test_expect_success 'cherry-pick --continue remembers --keep-redundant-commits' ' diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 3b0fa66c33..72020a51c4 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -154,7 +154,7 @@ test_expect_success 'skip "empty" commit' ' pristine_detach picked && test_commit dummy foo d && test_must_fail git cherry-pick anotherpick 2>err && - test_i18ngrep "git cherry-pick --skip" err && + test_grep "git cherry-pick --skip" err && git cherry-pick --skip && test_cmp_rev dummy HEAD ' @@ -314,7 +314,7 @@ test_expect_success '--abort does not unsafely change HEAD' ' git reset --hard base && test_must_fail git cherry-pick picked anotherpick && git cherry-pick --abort 2>actual && - test_i18ngrep "You seem to have moved HEAD" actual && + test_grep "You seem to have moved HEAD" actual && test_cmp_rev base HEAD ' @@ -520,7 +520,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' ' test_cmp_rev unrelatedpick CHERRY_PICK_HEAD && git checkout HEAD -- unrelated && test_must_fail git cherry-pick --continue 2>msg && - test_i18ngrep "The previous cherry-pick is now empty" msg + test_grep "The previous cherry-pick is now empty" msg ' test_expect_success 'follow advice and skip nil patch' ' diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 0e8afe49ed..98259e2ada 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -276,7 +276,7 @@ test_expect_success 'Resolving by removal is not a warning-worthy event' ' blob=$(echo blob | git hash-object -w --stdin) && printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info && git rm blob >msg 2>&1 && - test_i18ngrep ! "needs merge" msg && + test_grep ! "needs merge" msg && test_must_fail git ls-files -s --error-unmatch blob ' @@ -631,7 +631,7 @@ test_expect_success 'rm of a populated submodule with a .git directory migrates test_path_is_missing submod/.git && git status -s -uno --ignore-submodules=none >actual && test_file_not_empty actual && - test_i18ngrep Migrating output.err + test_grep Migrating output.err ' cat >expect.deepmodified <<EOF @@ -722,7 +722,7 @@ test_expect_success "rm absorbs submodule's nested .git directory" ' test_path_is_missing submod/subsubmod/.git && git status -s -uno --ignore-submodules=none >actual && test_file_not_empty actual && - test_i18ngrep Migrating output.err + test_grep Migrating output.err ' test_expect_success 'checking out a commit after submodule removal needs manual updates' ' @@ -731,7 +731,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ && git checkout -q main 2>actual && - test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual && + test_grep "^warning: unable to rmdir '\''submod'\'':" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh index a2a0c820fe..7cef12981c 100755 --- a/t/t3601-rm-pathspec-file.sh +++ b/t/t3601-rm-pathspec-file.sh @@ -67,14 +67,14 @@ test_expect_success 'error conditions' ' echo fileA.t >list && test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && + test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git rm --pathspec-file-nul 2>err && - test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && + test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && >empty_list && test_must_fail git rm --pathspec-from-file=empty_list 2>err && - test_i18ngrep -e "No pathspec was given. Which files should I remove?" err + test_grep -e "No pathspec was given. Which files should I remove?" err ' test_done diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 7623689da2..f23d39f0d5 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -438,7 +438,7 @@ test_expect_success 'git add --chmod fails with non regular files (but updates t test_ln_s_add foo foo3 && touch foo4 && test_must_fail git add --chmod=+x foo3 foo4 2>stderr && - test_i18ngrep "cannot chmod +x .foo3." stderr && + test_grep "cannot chmod +x .foo3." stderr && test_mode_in_index 120000 foo3 && test_mode_in_index 100755 foo4 ' @@ -455,12 +455,12 @@ test_expect_success 'git add --chmod --dry-run reports error for non regular fil git reset --hard && test_ln_s_add foo foo4 && test_must_fail git add --chmod=+x --dry-run foo4 2>stderr && - test_i18ngrep "cannot chmod +x .foo4." stderr + test_grep "cannot chmod +x .foo4." stderr ' test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' ' test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr && - test_i18ngrep "pathspec .nonexistent. did not match any files" stderr + test_grep "pathspec .nonexistent. did not match any files" stderr ' test_expect_success 'no file status change if no pathspec is given' ' diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 34aabb7f5f..0b5339ac6c 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -335,12 +335,12 @@ test_expect_success 'different prompts for mode change/deleted' ' test_expect_success 'correct message when there is nothing to do' ' git reset --hard && git add -p 2>err && - test_i18ngrep "No changes" err && + test_grep "No changes" err && printf "\\0123" >binary && git add binary && printf "\\0abc" >binary && git add -p 2>err && - test_i18ngrep "Only binary files changed" err + test_grep "Only binary files changed" err ' test_expect_success 'setup again' ' @@ -497,7 +497,7 @@ test_expect_success 'adding an empty file' ' echo y | git checkout -p added-file -- >actual && test_path_is_file empty && - test_i18ngrep "Apply addition to index and worktree" actual + test_grep "Apply addition to index and worktree" actual ) ' @@ -838,7 +838,7 @@ test_expect_success 'diff.algorithm is passed to `git diff-files`' ' git add file && echo changed >file && test_must_fail git -c diff.algorithm=bogus add -p 2>err && - test_i18ngrep "error: option diff-algorithm accepts " err + test_grep "error: option diff-algorithm accepts " err ' test_expect_success 'patch-mode via -i prompts for files' ' diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh index 4e6b5177c9..3aa59f6f63 100755 --- a/t/t3704-add-pathspec-file.sh +++ b/t/t3704-add-pathspec-file.sh @@ -138,23 +138,23 @@ test_expect_success 'error conditions' ' >empty_list && test_must_fail git add --pathspec-from-file=list --interactive 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err && test_must_fail git add --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err && test_must_fail git add --pathspec-from-file=list --edit 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err && test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && + test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git add --pathspec-file-nul 2>err && - test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && + test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && # This case succeeds, but still prints to stderr git add --pathspec-from-file=empty_list 2>err && - test_i18ngrep -e "Nothing specified, nothing added." err + test_grep -e "Nothing specified, nothing added." err ' test_done diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index bfab245eb3..f27d09cfd9 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -45,7 +45,7 @@ test_expect_success 'UTF-8 invalid characters refused' ' printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + test_grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 overlong sequences rejected' ' @@ -55,7 +55,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' ' printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + test_grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 non-characters refused' ' @@ -64,7 +64,7 @@ test_expect_success 'UTF-8 non-characters refused' ' printf "Commit message\n\nNon-character:\364\217\277\276\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + test_grep "did not conform" "$HOME"/stderr ' test_expect_success 'UTF-8 non-characters refused' ' @@ -73,7 +73,7 @@ test_expect_success 'UTF-8 non-characters refused' ' printf "Commit message\n\nNon-character:\357\267\220\n" \ >"$HOME/invalid" && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && - test_i18ngrep "did not conform" "$HOME"/stderr + test_grep "did not conform" "$HOME"/stderr ' for H in ISO8859-1 eucJP ISO-2022-JP diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh index 4f16a735d9..4b37f78829 100755 --- a/t/t3901-i18n-patch.sh +++ b/t/t3901-i18n-patch.sh @@ -298,7 +298,7 @@ test_expect_success 'am --no-utf8 (U/L)' ' # commit-tree will warn that the commit message does not contain valid UTF-8 # as mailinfo did not convert it - test_i18ngrep "did not conform" err && + test_grep "did not conform" err && check_encoding 2 ' diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 0b3dfeaea2..3bec71f056 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -395,7 +395,7 @@ test_expect_success 'stash --staged' ' test_expect_success 'dont assume push with non-option args' ' test_must_fail git stash -q drop 2>err && - test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err + test_grep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err ' test_expect_success 'stash --invalid-option' ' @@ -596,7 +596,7 @@ test_expect_success 'giving too many ref arguments does not modify files' ' for type in apply pop "branch stash-branch" do test_must_fail git stash $type stash@{0} stash@{1} 2>err && - test_i18ngrep "Too many revisions" err && + test_grep "Too many revisions" err && test 123456789 = $(test-tool chmtime -g file2) || return 1 done ' @@ -604,14 +604,14 @@ test_expect_success 'giving too many ref arguments does not modify files' ' test_expect_success 'drop: too many arguments errors out (does nothing)' ' git stash list >expect && test_must_fail git stash drop stash@{0} stash@{1} 2>err && - test_i18ngrep "Too many revisions" err && + test_grep "Too many revisions" err && git stash list >actual && test_cmp expect actual ' test_expect_success 'show: too many arguments errors out (does nothing)' ' test_must_fail git stash show stash@{0} stash@{1} 2>err 1>out && - test_i18ngrep "Too many revisions" err && + test_grep "Too many revisions" err && test_must_be_empty out ' @@ -654,7 +654,7 @@ test_expect_success 'stash branch - stashes on stack, stash-like argument' ' test_expect_success 'stash branch complains with no arguments' ' test_must_fail git stash branch 2>err && - test_i18ngrep "No branch name specified" err + test_grep "No branch name specified" err ' test_expect_success 'stash show format defaults to --stat' ' diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index 5390eec4e3..1289ae3e07 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -404,7 +404,7 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' ' ) && w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") && test_must_fail git stash show --include-untracked "$w_commit" 2>err && - test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err + test_grep "worktree and untracked commit have duplicate entries: tracked" err ' test_expect_success 'stash show --{include,only}-untracked on stashes without untracked entries' ' diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh index dead9f18d9..73f2dbdeb0 100755 --- a/t/t3909-stash-pathspec-file.sh +++ b/t/t3909-stash-pathspec-file.sh @@ -88,13 +88,13 @@ test_expect_success 'error conditions' ' echo fileA.t >list && test_must_fail git stash push --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && + test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && + test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git stash push --pathspec-file-nul 2>err && - test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err + test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err ' test_done diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 3dc9047044..85be1367de 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -135,25 +135,25 @@ test_expect_success 'favour same basenames over different ones' ' mkdir subdir && git mv another-path subdir/path1 && git status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out + test_grep "renamed: .*path1 -> subdir/path1" out ' test_expect_success 'test diff.renames=true for git status' ' git -c diff.renames=true status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out + test_grep "renamed: .*path1 -> subdir/path1" out ' test_expect_success 'test diff.renames=false for git status' ' git -c diff.renames=false status >out && - test_i18ngrep ! "renamed: .*path1 -> subdir/path1" out && - test_i18ngrep "new file: .*subdir/path1" out && - test_i18ngrep "deleted: .*[^/]path1" out + test_grep ! "renamed: .*path1 -> subdir/path1" out && + test_grep "new file: .*subdir/path1" out && + test_grep "deleted: .*[^/]path1" out ' test_expect_success 'favour same basenames even with minor differences' ' git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && git status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out + test_grep "renamed: .*path1 -> subdir/path1" out ' test_expect_success 'two files with same basename and same content' ' @@ -165,7 +165,7 @@ test_expect_success 'two files with same basename and same content' ' git commit -m 2 && git mv dir other-dir && git status >out && - test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out + test_grep "renamed: .*dir/A/file -> other-dir/A/file" out ' test_expect_success 'setup for many rename source candidates' ' @@ -202,9 +202,9 @@ test_expect_success 'rename pretty print with nothing in common' ' git mv a/b/c c/b/a && git commit -m "a/b/c -> c/b/a" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output && + test_grep " a/b/c => c/b/a " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output + test_grep " a/b/c => c/b/a " output ' test_expect_success 'rename pretty print with common prefix' ' @@ -212,9 +212,9 @@ test_expect_success 'rename pretty print with common prefix' ' git mv c/b/a c/d/e && git commit -m "c/b/a -> c/d/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output && + test_grep " c/{b/a => d/e} " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output + test_grep " c/{b/a => d/e} " output ' test_expect_success 'rename pretty print with common suffix' ' @@ -222,9 +222,9 @@ test_expect_success 'rename pretty print with common suffix' ' git mv c/d/e d/e && git commit -m "c/d/e -> d/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output && + test_grep " {c/d => d}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output + test_grep " {c/d => d}/e " output ' test_expect_success 'rename pretty print with common prefix and suffix' ' @@ -232,9 +232,9 @@ test_expect_success 'rename pretty print with common prefix and suffix' ' git mv d/e d/f/e && git commit -m "d/e -> d/f/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output && + test_grep " d/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output + test_grep " d/{ => f}/e " output ' test_expect_success 'rename pretty print common prefix and suffix overlap' ' @@ -242,9 +242,9 @@ test_expect_success 'rename pretty print common prefix and suffix overlap' ' git mv d/f/e d/f/f/e && git commit -m "d/f/e d/f/f/e" && git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output && + test_grep " d/f/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output + test_grep " d/f/{ => f}/e " output ' test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' ' diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 5de1d19075..86f3693bc0 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -613,7 +613,7 @@ test_expect_success 'diff -I<regex> --stat' ' test_expect_success 'diff -I<regex>: detect malformed regex' ' test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error && - test_i18ngrep "invalid regex given to -I: " error + test_grep "invalid regex given to -I: " error ' # check_prefix <patch> <src> <dst> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 3cf2b7a7fb..7abd307c5c 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -2369,25 +2369,25 @@ test_expect_success 'interdiff: cover-letter' ' --q EOF git format-patch --cover-letter --interdiff=boop~2 -1 boop && - test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch && - test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch && + test_grep "^Interdiff:$" 0000-cover-letter.patch && + test_grep ! "^Interdiff:$" 0001-fleep.patch && sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual && test_cmp expect actual ' test_expect_success 'interdiff: reroll-count' ' git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop && - test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch + test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch ' test_expect_success 'interdiff: reroll-count with a non-integer' ' git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop && - test_i18ngrep "^Interdiff:$" v2.2-0000-cover-letter.patch + test_grep "^Interdiff:$" v2.2-0000-cover-letter.patch ' test_expect_success 'interdiff: reroll-count with a integer' ' git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop && - test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch + test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch ' test_expect_success 'interdiff: solo-patch' ' @@ -2396,7 +2396,7 @@ test_expect_success 'interdiff: solo-patch' ' EOF git format-patch --interdiff=boop~2 -1 boop && - test_i18ngrep "^Interdiff:$" 0001-fleep.patch && + test_grep "^Interdiff:$" 0001-fleep.patch && sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual && test_cmp expect actual ' diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index b298f220e0..730f025360 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -909,7 +909,7 @@ test_expect_success 'combined diff with autocrlf conversion' ' git commit -m "the other side" x && git config core.autocrlf true && test_must_fail git merge one-side >actual && - test_i18ngrep "Automatic merge failed" actual && + test_grep "Automatic merge failed" actual && git diff >actual.raw && sed -e "1,/^@@@/d" actual.raw >actual && @@ -2187,27 +2187,27 @@ test_expect_success 'compare whitespace delta across moved blocks' ' test_expect_success 'bogus settings in move detection erroring out' ' test_must_fail git diff --color-moved=bogus 2>err && - test_i18ngrep "must be one of" err && - test_i18ngrep bogus err && + test_grep "must be one of" err && + test_grep bogus err && test_must_fail git -c diff.colormoved=bogus diff 2>err && - test_i18ngrep "must be one of" err && - test_i18ngrep "from command-line config" err && + test_grep "must be one of" err && + test_grep "from command-line config" err && test_must_fail git diff --color-moved-ws=bogus 2>err && - test_i18ngrep "possible values" err && - test_i18ngrep bogus err && + test_grep "possible values" err && + test_grep bogus err && test_must_fail git -c diff.colormovedws=bogus diff 2>err && - test_i18ngrep "possible values" err && - test_i18ngrep "from command-line config" err + test_grep "possible values" err && + test_grep "from command-line config" err ' test_expect_success 'compare whitespace delta incompatible with other space options' ' test_must_fail git diff \ --color-moved-ws=allow-indentation-change,ignore-all-space \ 2>err && - test_i18ngrep allow-indentation-change err + test_grep allow-indentation-change err ' EMPTY='' diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index c8d555771d..e026fac1f4 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -53,15 +53,15 @@ do echo "*.java diff=$p" >.gitattributes && test_expect_code 1 git diff --no-index \ A.java B.java 2>msg && - test_i18ngrep ! fatal msg && - test_i18ngrep ! error msg + test_grep ! fatal msg && + test_grep ! error msg ' test_expect_success "builtin $p wordRegex pattern compiles" ' echo "*.java diff=$p" >.gitattributes && test_expect_code 1 git diff --no-index --word-diff \ A.java B.java 2>msg && - test_i18ngrep ! fatal msg && - test_i18ngrep ! error msg + test_grep ! fatal msg && + test_grep ! error msg ' test_expect_success "builtin $p pattern compiles on bare repo with --attr-source" ' @@ -79,8 +79,8 @@ do git -C bare.git symbolic-ref HEAD refs/heads/master && test_expect_code 1 git -C bare.git --attr-source=branchA \ diff --exit-code HEAD:A.java HEAD:B.java 2>msg && - test_i18ngrep ! fatal msg && - test_i18ngrep ! error msg + test_grep ! fatal msg && + test_grep ! error msg ' done @@ -88,7 +88,7 @@ test_expect_success 'last regexp must not be negated' ' echo "*.java diff=java" >.gitattributes && test_config diff.java.funcname "!static" && test_expect_code 128 git diff --no-index A.java B.java 2>msg && - test_i18ngrep ": Last expression must not be negated:" msg + test_grep ": Last expression must not be negated:" msg ' test_expect_success 'setup hunk header tests' ' diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh index eacc6694f7..c4394a27b5 100755 --- a/t/t4031-diff-rewrite-binary.sh +++ b/t/t4031-diff-rewrite-binary.sh @@ -53,7 +53,7 @@ test_expect_success 'rewrite diff --numstat shows binary changes' ' test_expect_success 'diff --stat counts binary rewrite as 0 lines' ' git diff -B --stat --summary >diff && grep "Bin" diff && - test_i18ngrep "0 insertions.*0 deletions" diff && + test_grep "0 insertions.*0 deletions" diff && grep " rewrite file" diff ' diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh index 70224c3da1..7b73462d53 100755 --- a/t/t4047-diff-dirstat.sh +++ b/t/t4047-diff-dirstat.sh @@ -943,37 +943,37 @@ test_expect_success '--dirstat=future_param,lines,0 should fail loudly' ' test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_must_be_empty actual_diff_dirstat && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "\--dirstat" actual_error + test_grep -q "future_param" actual_error && + test_grep -q "\--dirstat" actual_error ' test_expect_success '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters' ' test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_must_be_empty actual_diff_dirstat && - test_i18ngrep -q "dummy1" actual_error && - test_i18ngrep -q "2dummy" actual_error && - test_i18ngrep -q "\--dirstat" actual_error + test_grep -q "dummy1" actual_error && + test_grep -q "2dummy" actual_error && + test_grep -q "\--dirstat" actual_error ' test_expect_success 'diff.dirstat=future_param,0,lines should warn, but still work' ' git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat actual_diff_dirstat && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error && + test_grep -q "future_param" actual_error && + test_grep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_M actual_diff_dirstat_M && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error && + test_grep -q "future_param" actual_error && + test_grep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC && - test_i18ngrep -q "future_param" actual_error && - test_i18ngrep -q "diff\\.dirstat" actual_error + test_grep -q "future_param" actual_error && + test_grep -q "diff\\.dirstat" actual_error ' test_expect_success '--shortstat --dirstat should output only one dirstat' ' diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh index 6781cc9078..5a5d958b96 100755 --- a/t/t4053-diff-no-index.sh +++ b/t/t4053-diff-no-index.sh @@ -56,7 +56,7 @@ test_expect_success 'git diff --no-index executed outside repo gives correct err export GIT_CEILING_DIRECTORIES && cd non/git && test_must_fail git diff --no-index a 2>actual.err && - test_i18ngrep "usage: git diff --no-index" actual.err + test_grep "usage: git diff --no-index" actual.err ) ' diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh index 73048d0a52..3ea9ae99e0 100755 --- a/t/t4055-diff-context.sh +++ b/t/t4055-diff-context.sh @@ -74,13 +74,13 @@ test_expect_success 'plumbing not affected' ' test_expect_success 'non-integer config parsing' ' git config diff.context no && test_must_fail git diff 2>output && - test_i18ngrep "bad numeric config value" output + test_grep "bad numeric config value" output ' test_expect_success 'negative integer config parsing' ' git config diff.context -1 && test_must_fail git diff 2>output && - test_i18ngrep "bad config variable" output + test_grep "bad config variable" output ' test_expect_success '-U0 is valid, so is diff.context=0' ' diff --git a/t/t4068-diff-symmetric-merge-base.sh b/t/t4068-diff-symmetric-merge-base.sh index 2d650d8f10..3356d91cd4 100755 --- a/t/t4068-diff-symmetric-merge-base.sh +++ b/t/t4068-diff-symmetric-merge-base.sh @@ -68,27 +68,27 @@ test_expect_success 'diff with two merge bases' ' test_expect_success 'diff with no merge bases' ' test_must_fail git diff br2...br3 2>err && - test_i18ngrep "fatal: br2...br3: no merge base" err + test_grep "fatal: br2...br3: no merge base" err ' test_expect_success 'diff with too many symmetric differences' ' test_must_fail git diff br1...main br2...br3 2>err && - test_i18ngrep "usage" err + test_grep "usage" err ' test_expect_success 'diff with symmetric difference and extraneous arg' ' test_must_fail git diff main br1...main 2>err && - test_i18ngrep "usage" err + test_grep "usage" err ' test_expect_success 'diff with two ranges' ' test_must_fail git diff main br1..main br2..br3 2>err && - test_i18ngrep "usage" err + test_grep "usage" err ' test_expect_success 'diff with ranges and extra arg' ' test_must_fail git diff main br1..main commit-D 2>err && - test_i18ngrep "usage" err + test_grep "usage" err ' test_expect_success 'diff --merge-base with no commits' ' @@ -97,7 +97,7 @@ test_expect_success 'diff --merge-base with no commits' ' test_expect_success 'diff --merge-base with three commits' ' test_must_fail git diff --merge-base br1 br2 main 2>err && - test_i18ngrep "usage" err + test_grep "usage" err ' for cmd in diff-index diff @@ -143,19 +143,19 @@ do test_expect_success "$cmd --merge-base with non-commit" ' git checkout main && test_must_fail git $cmd --merge-base main^{tree} 2>err && - test_i18ngrep "fatal: --merge-base only works with commits" err + test_grep "fatal: --merge-base only works with commits" err ' test_expect_success "$cmd --merge-base with no merge bases and one commit" ' git checkout main && test_must_fail git $cmd --merge-base br3 2>err && - test_i18ngrep "fatal: no merge base found" err + test_grep "fatal: no merge base found" err ' test_expect_success "$cmd --merge-base with multiple merge bases and one commit" ' git checkout main && test_must_fail git $cmd --merge-base br1 2>err && - test_i18ngrep "fatal: multiple merge bases found" err + test_grep "fatal: multiple merge bases found" err ' done @@ -169,28 +169,28 @@ do test_expect_success "$cmd --merge-base commit and non-commit" ' test_must_fail git $cmd --merge-base br2 main^{tree} 2>err && - test_i18ngrep "fatal: --merge-base only works with commits" err + test_grep "fatal: --merge-base only works with commits" err ' test_expect_success "$cmd --merge-base with no merge bases and two commits" ' test_must_fail git $cmd --merge-base br2 br3 2>err && - test_i18ngrep "fatal: no merge base found" err + test_grep "fatal: no merge base found" err ' test_expect_success "$cmd --merge-base with multiple merge bases and two commits" ' test_must_fail git $cmd --merge-base main br1 2>err && - test_i18ngrep "fatal: multiple merge bases found" err + test_grep "fatal: multiple merge bases found" err ' done test_expect_success 'diff-tree --merge-base with one commit' ' test_must_fail git diff-tree --merge-base main 2>err && - test_i18ngrep "fatal: --merge-base only works with two commits" err + test_grep "fatal: --merge-base only works with two commits" err ' test_expect_success 'diff --merge-base with range' ' test_must_fail git diff --merge-base br2..br3 2>err && - test_i18ngrep "fatal: --merge-base does not work with ranges" err + test_grep "fatal: --merge-base does not work with ranges" err ' test_done diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh index a22a90d552..cbef0a593f 100755 --- a/t/t4115-apply-symlink.sh +++ b/t/t4115-apply-symlink.sh @@ -136,7 +136,7 @@ test_expect_success SYMLINKS '--reject removes .rej symlink if it exists' ' ln -s foo file.t.rej && test_must_fail git apply patch --reject 2>err && - test_i18ngrep "Rejected hunk" err && + test_grep "Rejected hunk" err && test_path_is_missing foo && test_path_is_file file.t.rej ' diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 497b62868d..697e86c0ff 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -31,7 +31,7 @@ test_expect_success 'apply git diff with -p2' ' test_expect_success 'apply with too large -p' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.file 2>err && - test_i18ngrep "removing 3 leading" err + test_grep "removing 3 leading" err ' test_expect_success 'apply (-p2) traditional diff with funny filenames' ' @@ -53,7 +53,7 @@ test_expect_success 'apply (-p2) traditional diff with funny filenames' ' test_expect_success 'apply with too large -p and fancy filename' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.escaped 2>err && - test_i18ngrep "removing 3 leading" err + test_grep "removing 3 leading" err ' test_expect_success 'apply (-p2) diff, mode change only' ' diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh index 9696537303..2089d84f64 100755 --- a/t/t4122-apply-symlink-inside.sh +++ b/t/t4122-apply-symlink-inside.sh @@ -95,19 +95,19 @@ test_expect_success SYMLINKS 'do not follow symbolic link (same input)' ' # same input creates a confusing symbolic link test_must_fail git apply patch 2>error-wt && - test_i18ngrep "beyond a symbolic link" error-wt && + test_grep "beyond a symbolic link" error-wt && test_path_is_missing arch/x86_64/dir && test_path_is_missing arch/i386/dir/file && test_must_fail git apply --index patch 2>error-ix && - test_i18ngrep "beyond a symbolic link" error-ix && + test_grep "beyond a symbolic link" error-ix && test_path_is_missing arch/x86_64/dir && test_path_is_missing arch/i386/dir/file && test_must_fail git ls-files --error-unmatch arch/x86_64/dir && test_must_fail git ls-files --error-unmatch arch/i386/dir && test_must_fail git apply --cached patch 2>error-ct && - test_i18ngrep "beyond a symbolic link" error-ct && + test_grep "beyond a symbolic link" error-ct && test_must_fail git ls-files --error-unmatch arch/x86_64/dir && test_must_fail git ls-files --error-unmatch arch/i386/dir && @@ -135,23 +135,23 @@ test_expect_success SYMLINKS 'do not follow symbolic link (existing)' ' git add arch/x86_64/dir && test_must_fail git apply add_file.patch 2>error-wt-add && - test_i18ngrep "beyond a symbolic link" error-wt-add && + test_grep "beyond a symbolic link" error-wt-add && test_path_is_missing arch/i386/dir/file && mkdir arch/i386/dir && >arch/i386/dir/file && test_must_fail git apply del_file.patch 2>error-wt-del && - test_i18ngrep "beyond a symbolic link" error-wt-del && + test_grep "beyond a symbolic link" error-wt-del && test_path_is_file arch/i386/dir/file && rm arch/i386/dir/file && test_must_fail git apply --index add_file.patch 2>error-ix-add && - test_i18ngrep "beyond a symbolic link" error-ix-add && + test_grep "beyond a symbolic link" error-ix-add && test_path_is_missing arch/i386/dir/file && test_must_fail git ls-files --error-unmatch arch/i386/dir && test_must_fail git apply --cached add_file.patch 2>error-ct-file && - test_i18ngrep "beyond a symbolic link" error-ct-file && + test_grep "beyond a symbolic link" error-ct-file && test_must_fail git ls-files --error-unmatch arch/i386/dir ' diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh index a1c7686519..e7a7295f1b 100755 --- a/t/t4129-apply-samemode.sh +++ b/t/t4129-apply-samemode.sh @@ -66,13 +66,13 @@ test_expect_success FILEMODE 'mode update (index only)' ' test_expect_success FILEMODE 'empty mode is rejected' ' git reset --hard && test_must_fail git apply patch-empty-mode.txt 2>err && - test_i18ngrep "invalid mode" err + test_grep "invalid mode" err ' test_expect_success FILEMODE 'bogus mode is rejected' ' git reset --hard && test_must_fail git apply patch-bogus-mode.txt 2>err && - test_i18ngrep "invalid mode" err + test_grep "invalid mode" err ' test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' ' diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh index 35f1060bc8..c21ddb2946 100755 --- a/t/t4133-apply-filenames.sh +++ b/t/t4133-apply-filenames.sh @@ -32,9 +32,9 @@ EOF test_expect_success 'apply diff with inconsistent filenames in headers' ' test_must_fail git apply bad1.patch 2>err && - test_i18ngrep "inconsistent new filename" err && + test_grep "inconsistent new filename" err && test_must_fail git apply bad2.patch 2>err && - test_i18ngrep "inconsistent old filename" err + test_grep "inconsistent old filename" err ' test_expect_success 'apply diff with new filename missing from headers' ' @@ -46,7 +46,7 @@ test_expect_success 'apply diff with new filename missing from headers' ' +1 EOF test_must_fail git apply missing_new_filename.diff 2>err && - test_i18ngrep "lacks filename information" err + test_grep "lacks filename information" err ' test_expect_success 'apply diff with old filename missing from headers' ' @@ -58,7 +58,7 @@ test_expect_success 'apply diff with old filename missing from headers' ' -1 EOF test_must_fail git apply missing_old_filename.diff 2>err && - test_i18ngrep "lacks filename information" err + test_grep "lacks filename information" err ' test_done diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 2935fe1b2d..3b12576269 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -779,7 +779,7 @@ test_expect_success 'am --resolved fails if index has unmerged entries' ' test_must_fail git am --resolved >err && test_path_is_dir .git/rebase-apply && test_cmp_rev second HEAD && - test_i18ngrep "still have unmerged paths" err + test_grep "still have unmerged paths" err ' test_expect_success 'am takes patches from a Pine mailbox' ' @@ -913,7 +913,7 @@ test_expect_success 'am newline in subject' ' test_tick && sed -e "s/second/second \\\n foo/" patch1 >patchnl && git am <patchnl >output.out 2>&1 && - test_i18ngrep "^Applying: second \\\n foo$" output.out + test_grep "^Applying: second \\\n foo$" output.out ' test_expect_success 'am -q is quiet' ' diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 5ed7e22827..edb38da701 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -46,7 +46,7 @@ do test_expect_success "am$with3 --skip continue after failed am$with3" ' test_must_fail git am$with3 --skip >output && - test_i18ngrep "^Applying: 6$" output && + test_grep "^Applying: 6$" output && test_cmp file-2-expect file-2 && test ! -f .git/MERGE_RR ' diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh index b7c3861407..4add7c7757 100755 --- a/t/t4153-am-resume-override-opts.sh +++ b/t/t4153-am-resume-override-opts.sh @@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' ' # Applying side1 will be quiet. test_must_fail git am --quiet side[123].eml >out && test_path_is_dir .git/rebase-apply && - test_i18ngrep ! "^Applying: " out && + test_grep ! "^Applying: " out && echo side1 >file && git add file && diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 7025cfdae5..fb53dddf79 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -433,13 +433,13 @@ test_expect_success 'rerere --no-no-rerere-autoupdate' ' git update-index --index-info <failedmerge && cp file3.conflict file3 && test_must_fail git rerere --no-no-rerere-autoupdate 2>err && - test_i18ngrep [Uu]sage err && + test_grep [Uu]sage err && test_must_fail git update-index --refresh ' test_expect_success 'rerere -h' ' test_must_fail git rerere -h >help && - test_i18ngrep [Uu]sage help + test_grep [Uu]sage help ' concat_insert () { diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index 8e4effebdb..d7382709fc 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -139,7 +139,7 @@ test_expect_success !MINGW 'shortlog can read --format=raw output' ' test_expect_success 'shortlog from non-git directory refuses extra arguments' ' test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out && - test_i18ngrep "too many arguments" out + test_grep "too many arguments" out ' test_expect_success 'shortlog should add newline when input line matches wraplen' ' diff --git a/t/t4202-log.sh b/t/t4202-log.sh index af4a123cd2..708636671a 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1884,7 +1884,7 @@ test_expect_success '--no-graph does not unset --parents' ' test_expect_success '--reverse and --graph conflict' ' test_must_fail git log --reverse --graph 2>stderr && - test_i18ngrep "cannot be used together" stderr + test_grep "cannot be used together" stderr ' test_expect_success '--reverse --graph --no-graph works' ' @@ -1895,7 +1895,7 @@ test_expect_success '--reverse --graph --no-graph works' ' test_expect_success '--show-linear-break and --graph conflict' ' test_must_fail git log --show-linear-break --graph 2>stderr && - test_i18ngrep "cannot be used together" stderr + test_grep "cannot be used together" stderr ' test_expect_success '--show-linear-break --graph --no-graph works' ' @@ -1906,7 +1906,7 @@ test_expect_success '--show-linear-break --graph --no-graph works' ' test_expect_success '--no-walk and --graph conflict' ' test_must_fail git log --no-walk --graph 2>stderr && - test_i18ngrep "cannot be used together" stderr + test_grep "cannot be used together" stderr ' test_expect_success '--no-walk --graph --no-graph works' ' @@ -1917,8 +1917,8 @@ test_expect_success '--no-walk --graph --no-graph works' ' test_expect_success '--walk-reflogs and --graph conflict' ' test_must_fail git log --walk-reflogs --graph 2>stderr && - (test_i18ngrep "cannot combine" stderr || - test_i18ngrep "cannot be used together" stderr) + (test_grep "cannot combine" stderr || + test_grep "cannot be used together" stderr) ' test_expect_success '--walk-reflogs --graph --no-graph works' ' @@ -2252,7 +2252,7 @@ test_expect_success 'log on empty repo fails' ' git init empty && test_when_finished "rm -rf empty" && test_must_fail git -C empty log 2>stderr && - test_i18ngrep does.not.have.any.commits stderr + test_grep does.not.have.any.commits stderr ' test_expect_success REFFILES 'log diagnoses bogus HEAD hash' ' @@ -2260,16 +2260,16 @@ test_expect_success REFFILES 'log diagnoses bogus HEAD hash' ' test_when_finished "rm -rf empty" && echo 1234abcd >empty/.git/refs/heads/main && test_must_fail git -C empty log 2>stderr && - test_i18ngrep broken stderr + test_grep broken stderr ' test_expect_success REFFILES 'log diagnoses bogus HEAD symref' ' git init empty && echo "ref: refs/heads/invalid.lock" > empty/.git/HEAD && test_must_fail git -C empty log 2>stderr && - test_i18ngrep broken stderr && + test_grep broken stderr && test_must_fail git -C empty log --default totally-bogus 2>stderr && - test_i18ngrep broken stderr + test_grep broken stderr ' test_expect_success 'log does not default to HEAD when rev input is given' ' diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index 2016132f51..8a88dd7900 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -360,7 +360,7 @@ test_expect_success 'mailmap.blob might be the wrong type' ' cp default.map .mailmap && git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err && - test_i18ngrep "mailmap is not a blob" err && + test_grep "mailmap is not a blob" err && test_cmp expect actual ' diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh index 2e8f5ad7b8..806b2809d4 100755 --- a/t/t4208-log-magic-pathspec.sh +++ b/t/t4208-log-magic-pathspec.sh @@ -21,7 +21,7 @@ test_expect_success '"git log :/" should not be ambiguous' ' test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' ' : >a && test_must_fail git log :/a 2>error && - test_i18ngrep ambiguous error + test_grep ambiguous error ' test_expect_success '"git log :/a -- " should not be ambiguous' ' @@ -65,7 +65,7 @@ test_expect_success '"git log :/in" should not be ambiguous' ' test_expect_success '"git log :" should be ambiguous' ' test_must_fail git log : 2>error && - test_i18ngrep ambiguous error + test_grep ambiguous error ' test_expect_success 'git log -- :' ' @@ -104,7 +104,7 @@ test_expect_success '"git log :(exclude)sub --" must resolve as an object' ' test_expect_success '"git log :(unknown-magic) complains of bogus magic' ' test_must_fail git log ":(unknown-magic)" 2>error && - test_i18ngrep pathspec.magic error + test_grep pathspec.magic error ' test_expect_success 'command line pathspec parsing for "git log"' ' diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index 7f6bb27f14..64e1623733 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -57,10 +57,10 @@ test_expect_success setup ' test_expect_success 'usage' ' test_expect_code 129 git log -S 2>err && - test_i18ngrep "switch.*requires a value" err && + test_grep "switch.*requires a value" err && test_expect_code 129 git log -G 2>err && - test_i18ngrep "switch.*requires a value" err && + test_grep "switch.*requires a value" err && test_expect_code 128 git log -Gregex -Sstring 2>err && grep "cannot be used together" err && diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index c6540e822f..02d76dca28 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -19,7 +19,7 @@ test_expect_success 'basic command line parsing' ' # -L requires there is no pathspec test_must_fail git log -L1,1:b.c -- b.c 2>error && - test_i18ngrep "cannot be used with pathspec" error && + test_grep "cannot be used with pathspec" error && # This would fail because --follow wants a single path, but # we may fail due to incompatibility between -L/--follow in @@ -50,7 +50,7 @@ canned_test_failure () { test_bad_opts () { test_expect_success "invalid args: $1" " test_must_fail git log $1 2>errors && - test_i18ngrep '$2' errors + test_grep '$2' errors " } diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh index 85e90acb09..e6b59123a3 100755 --- a/t/t4212-log-corrupt.sh +++ b/t/t4212-log-corrupt.sh @@ -17,7 +17,7 @@ test_expect_success 'setup' ' test_expect_success 'fsck notices broken commit' ' test_must_fail git fsck 2>actual && - test_i18ngrep invalid.author actual + test_grep invalid.author actual ' test_expect_success 'git log with broken author email' ' diff --git a/t/t4256-am-format-flowed.sh b/t/t4256-am-format-flowed.sh index 1015273bc8..92d8c8b651 100755 --- a/t/t4256-am-format-flowed.sh +++ b/t/t4256-am-format-flowed.sh @@ -13,7 +13,7 @@ test_expect_success 'setup' ' test_expect_success 'am with format=flowed' ' git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr && - test_i18ngrep "warning: Patch sent with format=flowed" stderr && + test_grep "warning: Patch sent with format=flowed" stderr && test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c ' diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 745089479c..d402ec18b7 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -541,7 +541,7 @@ test_expect_success 'make sure index-pack detects the SHA1 collision' ' ( cd corrupt && test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg && - test_i18ngrep "SHA1 COLLISION FOUND" msg + test_grep "SHA1 COLLISION FOUND" msg ) ' @@ -549,7 +549,7 @@ test_expect_success 'make sure index-pack detects the SHA1 collision (large blob ( cd corrupt && test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg && - test_i18ngrep "SHA1 COLLISION FOUND" msg + test_grep "SHA1 COLLISION FOUND" msg ) ' diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index f89809be53..d88e6f1691 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -282,8 +282,8 @@ test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in test_expect_success 'index-pack -v --stdin produces progress for both phases' ' pack=$(git pack-objects --all pack </dev/null) && GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err && - test_i18ngrep "Receiving objects" err && - test_i18ngrep "Resolving deltas" err + test_grep "Receiving objects" err && + test_grep "Resolving deltas" err ' test_expect_success 'too-large packs report the breach' ' diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index b4df545e5a..1f1f664871 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -318,10 +318,10 @@ test_expect_success 'prune: handle HEAD reflog in multiple worktrees' ' test_expect_success 'prune: handle expire option correctly' ' test_must_fail git prune --expire 2>error && - test_i18ngrep "requires a value" error && + test_grep "requires a value" error && test_must_fail git prune --expire=nyah 2>error && - test_i18ngrep "malformed expiration" error && + test_grep "malformed expiration" error && git prune --no-expire ' diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 78c1c6c923..d7fd71360e 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -271,7 +271,7 @@ test_bitmap_cases () { mv -f $bitmap.tmp $bitmap && git rev-list --use-bitmap-index --count --all >actual 2>stderr && test_cmp expect actual && - test_i18ngrep corrupt.ewah.bitmap stderr + test_grep corrupt.ewah.bitmap stderr ' test_expect_success 'truncated bitmap fails gracefully (cache)' ' @@ -284,7 +284,7 @@ test_bitmap_cases () { mv -f $bitmap.tmp $bitmap && git rev-list --use-bitmap-index --count --all >actual 2>stderr && test_cmp expect actual && - test_i18ngrep corrupted.bitmap.index stderr + test_grep corrupted.bitmap.index stderr ' # Create a state of history with these properties: @@ -471,7 +471,7 @@ sane_unset GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL test_expect_success 'incremental repack fails when bitmaps are requested' ' test_commit more-1 && test_must_fail git repack -d 2>err && - test_i18ngrep "Incremental repacks are incompatible with bitmap" err + test_grep "Incremental repacks are incompatible with bitmap" err ' test_expect_success 'incremental repack can disable bitmaps' ' @@ -524,7 +524,7 @@ test_expect_success 'truncated bitmap fails gracefully (lookup table)' ' mv -f $bitmap.tmp $bitmap && git rev-list --use-bitmap-index --count --all >actual 2>stderr && test_cmp expect actual && - test_i18ngrep corrupted.bitmap.index stderr + test_grep corrupted.bitmap.index stderr ' test_done diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 4df76173a8..10718142b0 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -47,7 +47,7 @@ test_expect_success 'exit with correct error on bad input to --stdin-packs' ' echo doesnotexist >in && test_expect_code 1 git -C full commit-graph write --stdin-packs \ <in 2>stderr && - test_i18ngrep "error adding pack" stderr + test_grep "error adding pack" stderr ' test_expect_success 'create commits and repack' ' @@ -67,11 +67,11 @@ test_expect_success 'exit with correct error on bad input to --stdin-commits' ' # invalid, non-hex OID echo HEAD | test_expect_code 1 git -C full commit-graph write \ --stdin-commits 2>stderr && - test_i18ngrep "unexpected non-hex object ID: HEAD" stderr && + test_grep "unexpected non-hex object ID: HEAD" stderr && # non-existent OID echo $ZERO_OID | test_expect_code 1 git -C full commit-graph write \ --stdin-commits 2>stderr && - test_i18ngrep "invalid object" stderr && + test_grep "invalid object" stderr && # valid commit and tree OID git -C full rev-parse HEAD HEAD^{tree} >in && git -C full commit-graph write --stdin-commits <in && @@ -143,7 +143,7 @@ test_expect_success 'commit-graph write --stdin-commits force progress on for st git -C full rev-parse commits/5 >in && GIT_PROGRESS_DELAY=0 git -C full commit-graph write --stdin-commits \ --progress <in 2>err && - test_i18ngrep "Collecting commits from input" err + test_grep "Collecting commits from input" err ' test_expect_success 'commit-graph write --stdin-commits with the --no-progress option' ' @@ -383,13 +383,13 @@ test_expect_success 'warn on improper hash version' ' cd sha1 && mv ../cg-sha256 .git/objects/info/commit-graph && git log -1 2>err && - test_i18ngrep "commit-graph hash version 2 does not match version 1" err + test_grep "commit-graph hash version 2 does not match version 1" err ) && ( cd sha256 && mv ../cg-sha1 .git/objects/info/commit-graph && git log -1 2>err && - test_i18ngrep "commit-graph hash version 1 does not match version 2" err + test_grep "commit-graph hash version 1 does not match version 2" err ) ' @@ -473,7 +473,7 @@ corrupt_graph_verify() { grepstr=$1 test_must_fail git -C full commit-graph verify 2>test_err && grep -v "^+" test_err >err && - test_i18ngrep "$grepstr" err && + test_grep "$grepstr" err && if test "$2" != "no-copy" then cp full/$objdir/info/commit-graph commit-graph-pre-write-test @@ -714,7 +714,7 @@ test_expect_success 'corrupt commit-graph write (broken parent)' ' git commit-tree -p "$broken" -m "good commit" "$empty" >good && test_must_fail git commit-graph write --stdin-commits \ <good 2>test_err && - test_i18ngrep "unable to parse commit" test_err + test_grep "unable to parse commit" test_err ) ' @@ -735,7 +735,7 @@ test_expect_success 'corrupt commit-graph write (missing tree)' ' git commit-tree -p "$broken" -m "good" "$tree" >good && test_must_fail git commit-graph write --stdin-commits \ <good 2>test_err && - test_i18ngrep "unable to parse commit" test_err + test_grep "unable to parse commit" test_err ) ' diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 1bcc02004d..4b01d78ccb 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -279,13 +279,13 @@ test_expect_success 'warn on improper hash version' ' cd sha1 && mv ../mpi-sha256 .git/objects/pack/multi-pack-index && git log -1 2>err && - test_i18ngrep "multi-pack-index hash version 2 does not match version 1" err + test_grep "multi-pack-index hash version 2 does not match version 1" err ) && ( cd sha256 && mv ../mpi-sha1 .git/objects/pack/multi-pack-index && git log -1 2>err && - test_i18ngrep "multi-pack-index hash version 1 does not match version 2" err + test_grep "multi-pack-index hash version 1 does not match version 2" err ) ' @@ -386,7 +386,7 @@ corrupt_midx_and_verify() { printf "$DATA" | dd of="$FILE" bs=1 seek="$POS" conv=notrunc && test_must_fail $COMMAND 2>test_err && grep -v "^+" test_err >err && - test_i18ngrep "$GREPSTR" err + test_grep "$GREPSTR" err } test_expect_success 'verify bad signature' ' @@ -501,7 +501,7 @@ test_expect_success 'corrupt MIDX is not reused' ' corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" && git multi-pack-index write 2>err && - test_i18ngrep checksum.mismatch err && + test_grep checksum.mismatch err && git multi-pack-index verify ' @@ -1031,7 +1031,7 @@ test_expect_success 'load reverse index when missing .idx, .pack' ' test_expect_success 'usage shown without sub-command' ' test_expect_code 129 git multi-pack-index 2>err && - ! test_i18ngrep "unrecognized subcommand" err + ! test_grep "unrecognized subcommand" err ' test_expect_success 'complains when run outside of a repository' ' diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 36c4141e67..a48c00ef50 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -281,7 +281,7 @@ test_expect_success 'verify hashes along chain, even in shallow' ' corrupt_file "$base_file" $(test_oid shallow) "\01" && test_must_fail git commit-graph verify --shallow 2>test_err && grep -v "^+" test_err >err && - test_i18ngrep "incorrect checksum" err + test_grep "incorrect checksum" err ) ' @@ -295,7 +295,7 @@ test_expect_success 'verify --shallow does not check base contents' ' git commit-graph verify --shallow && test_must_fail git commit-graph verify 2>test_err && grep -v "^+" test_err >err && - test_i18ngrep "incorrect che