diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-31 08:23:30 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 11:13:44 +0300 |
commit | 6789275d3780bcb950e6be8557aeedf160d4ad6d (patch) | |
tree | 24c1fcc6ee63c63284e507b05e3332eb6f6d5537 /t/t5520-pull.sh | |
parent | 2e87fca189e613912b085c5140312b1f4b3f2977 (diff) |
tests: teach callers of test_i18ngrep to use test_grep
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>
Diffstat (limited to 't/t5520-pull.sh')
-rwxr-xr-x | t/t5520-pull.sh | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 0b72112fb1..47534f1062 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -31,7 +31,7 @@ test_pull_autostash_fail () { echo dirty >new_file && git add new_file && test_must_fail git pull "$@" . copy 2>err && - test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err + test_grep -E "uncommitted changes.|overwritten by merge:" err } test_expect_success setup ' @@ -151,7 +151,7 @@ test_expect_success 'fail if wildcard spec does not match any refs' ' echo file >expect && test_cmp expect file && test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err && - test_i18ngrep "no candidates for merging" err && + test_grep "no candidates for merging" err && test_cmp expect file ' @@ -164,7 +164,7 @@ test_expect_success 'fail if no branches specified with non-default remote' ' test_cmp expect file && test_config branch.test.remote origin && test_must_fail git pull test_remote 2>err && - test_i18ngrep "specify a branch on the command line" err && + test_grep "specify a branch on the command line" err && test_cmp expect file ' @@ -176,7 +176,7 @@ test_expect_success 'fail if not on a branch' ' echo file >expect && test_cmp expect file && test_must_fail git pull 2>err && - test_i18ngrep "not currently on a branch" err && + test_grep "not currently on a branch" err && test_cmp expect file ' @@ -189,7 +189,7 @@ test_expect_success 'fail if no configuration for current branch' ' echo file >expect && test_cmp expect file && test_must_fail git pull 2>err && - test_i18ngrep "no tracking information" err && + test_grep "no tracking information" err && test_cmp expect file ' @@ -202,7 +202,7 @@ test_expect_success 'pull --all: fail if no configuration for current branch' ' echo file >expect && test_cmp expect file && test_must_fail git pull --all 2>err && - test_i18ngrep "There is no tracking information" err && + test_grep "There is no tracking information" err && test_cmp expect file ' @@ -214,7 +214,7 @@ test_expect_success 'fail if upstream branch does not exist' ' echo file >expect && test_cmp expect file && test_must_fail git pull 2>err && - test_i18ngrep "no such ref was fetched" err && + test_grep "no such ref was fetched" err && test_cmp expect file ' @@ -248,13 +248,13 @@ test_expect_success 'fail if the index has unresolved entries' ' test_file_not_empty unmerged && cp file expected && test_must_fail git pull . second 2>err && - test_i18ngrep "Pulling is not possible because you have unmerged files." err && + test_grep "Pulling is not possible because you have unmerged files." err && test_cmp expected file && git add file && git ls-files -u >unmerged && test_must_be_empty unmerged && test_must_fail git pull . second 2>err && - test_i18ngrep "You have not concluded your merge" err && + test_grep "You have not concluded your merge" err && test_cmp expected file ' @@ -264,7 +264,7 @@ test_expect_success 'fast-forwards working tree if branch head is updated' ' echo file >expect && test_cmp expect file && git pull . second:third 2>err && - test_i18ngrep "fetch updated the current branch head" err && + test_grep "fetch updated the current branch head" err && echo modified >expect && test_cmp expect file && test_cmp_rev third second @@ -277,7 +277,7 @@ test_expect_success 'fast-forward fails with conflicting work tree' ' test_cmp expect file && echo conflict >file && test_must_fail git pull . second:third 2>err && - test_i18ngrep "Cannot fast-forward your working tree" err && + test_grep "Cannot fast-forward your working tree" err && echo conflict >expect && test_cmp expect file && test_cmp_rev third second @@ -375,7 +375,7 @@ test_expect_success '--rebase with conflicts shows advice' ' test_tick && git commit -m "Create conflict" seq.txt && test_must_fail git pull --rebase . seq 2>err >out && - test_i18ngrep "Resolve all conflicts manually" err + test_grep "Resolve all conflicts manually" err ' test_expect_success 'failed --rebase shows advice' ' @@ -389,14 +389,14 @@ test_expect_success 'failed --rebase shows advice' ' git checkout -f -b fails-to-rebase HEAD^ && test_commit v2-without-cr file "2" file2-lf && test_must_fail git pull --rebase . diverging 2>err >out && - test_i18ngrep "Resolve all conflicts manually" err + test_grep "Resolve all conflicts manually" err ' test_expect_success '--rebase fails with multiple branches' ' git reset --hard before-rebase && test_must_fail git pull --rebase . copy main 2>err && test_cmp_rev HEAD before-rebase && - test_i18ngrep "Cannot rebase onto multiple branches" err && + test_grep "Cannot rebase onto multiple branches" err && echo modified >expect && git show HEAD:file >actual && test_cmp expect actual @@ -520,7 +520,7 @@ test_expect_success 'pull --rebase warns on --verify-signatures' ' echo new >expect && git show HEAD:file2 >actual && test_cmp expect actual && - test_i18ngrep "ignoring --verify-signatures for rebase" err + test_grep "ignoring --verify-signatures for rebase" err ' test_expect_success 'pull --rebase does not warn on --no-verify-signatures' ' @@ -530,7 +530,7 @@ test_expect_success 'pull --rebase does not warn on --no-verify-signatures' ' echo new >expect && git show HEAD:file2 >actual && test_cmp expect actual && - test_i18ngrep ! "verify-signatures" err + test_grep ! "verify-signatures" err ' # add a feature branch, keep-merge, that is merged into main, so the @@ -740,7 +740,7 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' ' test_cmp expect actual && git show :staged-file >actual && test_cmp expect actual && - test_i18ngrep "unborn branch with changes added to the index" err + test_grep "unborn branch with changes added to the index" err ) ' |