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:
Ævar Arnfjörð Bjarmason
committed by
Junio C Hamano
Junio C Hamano
parent
b1e079807b
commit
1108cea7f8
@ -74,7 +74,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
|
||||
git fetch --recurse-submodules >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "submodule.recurse option triggers recursive fetch" '
|
||||
@ -84,7 +84,7 @@ test_expect_success "submodule.recurse option triggers recursive fetch" '
|
||||
git -c submodule.recurse fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
|
||||
@ -94,7 +94,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou
|
||||
GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err &&
|
||||
test_cmp expect.err actual.err &&
|
||||
grep "2 tasks" trace.out
|
||||
'
|
||||
|
||||
@ -124,7 +124,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
|
||||
@ -155,7 +155,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
|
||||
git config --unset submodule.submodule.fetchRecurseSubmodules
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "--quiet propagates to submodules" '
|
||||
@ -183,7 +183,7 @@ test_expect_success "--dry-run propagates to submodules" '
|
||||
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "Without --dry-run propagates to submodules" '
|
||||
@ -192,7 +192,7 @@ test_expect_success "Without --dry-run propagates to submodules" '
|
||||
git fetch --recurse-submodules >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "recurseSubmodules=true propagates into submodules" '
|
||||
@ -203,7 +203,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "--recurse-submodules overrides config in submodule" '
|
||||
@ -217,7 +217,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" '
|
||||
git fetch --recurse-submodules >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "--no-recurse-submodules overrides config setting" '
|
||||
@ -257,7 +257,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
|
||||
cd downstream &&
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_i18ncmp expect.err.sub actual.err &&
|
||||
test_cmp expect.err.sub actual.err &&
|
||||
test_must_be_empty actual.out
|
||||
'
|
||||
|
||||
@ -275,7 +275,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err.file actual.err
|
||||
test_cmp expect.err.file actual.err
|
||||
'
|
||||
|
||||
test_expect_success "Recursion picks up config in submodule" '
|
||||
@ -303,7 +303,7 @@ test_expect_success "Recursion picks up config in submodule" '
|
||||
git config --unset fetch.recurseSubmodules
|
||||
)
|
||||
) &&
|
||||
test_i18ncmp expect.err.sub actual.err &&
|
||||
test_cmp expect.err.sub actual.err &&
|
||||
test_must_be_empty actual.out
|
||||
'
|
||||
|
||||
@ -336,7 +336,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
|
||||
cd downstream &&
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_i18ncmp expect.err.2 actual.err &&
|
||||
test_cmp expect.err.2 actual.err &&
|
||||
test_must_be_empty actual.out
|
||||
'
|
||||
|
||||
@ -392,7 +392,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
|
||||
)
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err
|
||||
test_cmp expect.err actual.err
|
||||
'
|
||||
|
||||
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
|
||||
@ -409,7 +409,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
|
||||
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err.file actual.err
|
||||
test_cmp expect.err.file actual.err
|
||||
'
|
||||
|
||||
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
|
||||
@ -437,7 +437,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
|
||||
git config --unset fetch.recurseSubmodules
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err.2 actual.err
|
||||
test_cmp expect.err.2 actual.err
|
||||
'
|
||||
|
||||
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
|
||||
@ -465,7 +465,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
|
||||
git config --unset submodule.submodule.fetchRecurseSubmodules
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err.2 actual.err
|
||||
test_cmp expect.err.2 actual.err
|
||||
'
|
||||
|
||||
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
|
||||
@ -484,7 +484,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
|
||||
git fetch >../actual.out 2>../actual.err
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err actual.err &&
|
||||
test_cmp expect.err actual.err &&
|
||||
(
|
||||
cd submodule &&
|
||||
git checkout -q sub
|
||||
@ -520,7 +520,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git
|
||||
git reset --hard
|
||||
) &&
|
||||
test_must_be_empty actual.out &&
|
||||
test_i18ncmp expect.err.2 actual.err &&
|
||||
test_cmp expect.err.2 actual.err &&
|
||||
git checkout HEAD^ -- .gitmodules &&
|
||||
git add .gitmodules &&
|
||||
git commit -m "new submodule restored .gitmodules"
|
||||
|
||||
Reference in New Issue
Block a user