tests: remove most uses of test_i18ncmp
As a follow-up to d162b25f95
(tests: remove support for
GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp
via a simple s/test_i18ncmp/test_cmp/g search-replacement.
I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight
changes between "master" and "seen", as well as the prerequisite
itself due to other changes between "master" and "next/seen" which add
new test_i18ncmp uses.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
b1e079807b
commit
1108cea7f8
@ -41,7 +41,7 @@ Unmerged paths:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ Changes to be committed:
|
||||
Untracked files not listed (use -u option to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ Unmerged paths:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ Changes to be committed:
|
||||
Untracked files not listed (use -u option to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -154,7 +154,7 @@ Unmerged paths:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -180,7 +180,7 @@ Changes to be committed:
|
||||
Untracked files not listed (use -u option to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -210,7 +210,7 @@ You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ Changes not staged for commit:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -282,7 +282,7 @@ You are currently editing a commit while rebasing branch '\''amend_last'\'' on '
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -321,7 +321,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -356,7 +356,7 @@ Changes not staged for commit:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -387,7 +387,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -418,7 +418,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -454,7 +454,7 @@ Changes not staged for commit:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -486,7 +486,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -519,7 +519,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -557,7 +557,7 @@ Changes not staged for commit:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -591,7 +591,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -619,7 +619,7 @@ You are in the middle of an am session.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -641,7 +641,7 @@ You are in the middle of an am session.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -664,7 +664,7 @@ The current patch is empty.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -687,7 +687,7 @@ You are currently bisecting, started from branch '\''bisect'\''.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -712,7 +712,7 @@ Unmerged paths:
|
||||
no changes added to commit
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -746,7 +746,7 @@ Unmerged paths:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
||||
@ -770,7 +770,7 @@ Changes to be committed:
|
||||
Untracked files not listed (use -u option to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status when cherry-picking after committing conflict resolution' '
|
||||
@ -789,7 +789,7 @@ Cherry-pick currently in progress.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status shows cherry-pick with invalid oid' '
|
||||
@ -798,7 +798,7 @@ test_expect_success 'status shows cherry-pick with invalid oid' '
|
||||
git status --untracked-files=no >actual 2>err &&
|
||||
git cherry-pick --quit &&
|
||||
test_must_be_empty err &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status does not show error if .git/sequencer is a file' '
|
||||
@ -816,7 +816,7 @@ HEAD detached at atag
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual &&
|
||||
test_cmp expected actual &&
|
||||
|
||||
git reset --hard HEAD^ &&
|
||||
cat >expected <<\EOF &&
|
||||
@ -824,7 +824,7 @@ HEAD detached from atag
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status while reverting commit (conflicts)' '
|
||||
@ -852,7 +852,7 @@ Unmerged paths:
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status while reverting commit (conflicts resolved)' '
|
||||
@ -872,7 +872,7 @@ Changes to be committed:
|
||||
Untracked files not listed (use -u option to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status after reverting commit' '
|
||||
@ -882,7 +882,7 @@ On branch main
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status while reverting after committing conflict resolution' '
|
||||
@ -901,7 +901,7 @@ Revert currently in progress.
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'prepare for different number of commits rebased' '
|
||||
@ -931,7 +931,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status: two commands done with some white lines in done file' '
|
||||
@ -959,7 +959,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status: two remaining commands with some white lines in todo file' '
|
||||
@ -988,7 +988,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
git status --untracked-files=no >actual &&
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
|
||||
@ -1007,7 +1007,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
|
||||
|
||||
nothing to commit (use -u to show untracked files)
|
||||
EOF
|
||||
test_i18ncmp expected actual
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Reference in New Issue
Block a user