diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-11 02:53:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-02-10 23:48:27 -0800 |
| commit | 1108cea7f8ee38a8507c1cc68d1fafe2eb31d623 (patch) | |
| tree | d739cc6d7733e975f04482966302d19e5a480540 /t/t3508-cherry-pick-many-commits.sh | |
| parent | tests: remove last uses of C_LOCALE_OUTPUT (diff) | |
| download | tgif-1108cea7f8ee38a8507c1cc68d1fafe2eb31d623.tar.xz | |
tests: remove most uses of test_i18ncmp
As a follow-up to d162b25f956 (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>
Diffstat (limited to 't/t3508-cherry-pick-many-commits.sh')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index ec7a2c9fcf..e8375d1c97 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -86,7 +86,7 @@ test_expect_success 'output to keep user entertained during multi-pick' ' git cherry-pick first..fourth >actual && sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy && test_line_count -ge 3 actual.fuzzy && - test_i18ncmp expected actual.fuzzy + test_cmp expected actual.fuzzy ' test_expect_success 'cherry-pick --strategy resolve first..fourth works' ' @@ -123,7 +123,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' ' test_tick && git cherry-pick --strategy resolve first..fourth >actual && sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy && - test_i18ncmp expected actual.fuzzy + test_cmp expected actual.fuzzy ' test_expect_success 'cherry-pick --ff first..fourth works' ' |