diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-11 01:53:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 07:48:27 (GMT) |
| commit | 1108cea7f8ee38a8507c1cc68d1fafe2eb31d623 (patch) | |
| tree | d739cc6d7733e975f04482966302d19e5a480540 /t/t3504-cherry-pick-rerere.sh | |
| parent | b1e079807b3d3c3592c40cab8bc0379879b6fad5 (diff) | |
| download | git-1108cea7f8ee38a8507c1cc68d1fafe2eb31d623.zip git-1108cea7f8ee38a8507c1cc68d1fafe2eb31d623.tar.gz git-1108cea7f8ee38a8507c1cc68d1fafe2eb31d623.tar.bz2 | |
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/t3504-cherry-pick-rerere.sh')
| -rwxr-xr-x | t/t3504-cherry-pick-rerere.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh index 9198535..4581ae9 100755 --- a/t/t3504-cherry-pick-rerere.sh +++ b/t/t3504-cherry-pick-rerere.sh @@ -74,10 +74,10 @@ test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' ' git diff-files --quiet && test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 && echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect && - test_i18ncmp expect actual && + test_cmp expect actual && test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 && echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect && - test_i18ncmp expect actual && + test_cmp expect actual && git cherry-pick --abort ' |