mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
tests: remove all uses of test_i18cmp
Finish the removal I started in 1108cea7f8
(tests: remove most uses
of test_i18ncmp, 2021-02-11). At that time the function wasn't removed
due to disruption with in-flight changes, remove the occurrences that
have landed since then.
As of writing this there are no test_i18ncmp uses between "master" and
"seen", so let's also remove the function to finally put it to rest.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
89b43f80a5
commit
feeb03bce6
|
@ -157,7 +157,7 @@ test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
|
|||
git -c commit.status=false rebase -ik --signoff A &&
|
||||
git diff-tree --exit-code --patch HEAD B3 -- &&
|
||||
test_cmp_rev HEAD^ A &&
|
||||
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
|
||||
test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
|
||||
actual-squash-message
|
||||
'
|
||||
|
||||
|
@ -191,7 +191,7 @@ test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
|
|||
FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
|
||||
FAKE_MESSAGE_COPY=actual-combined-message \
|
||||
git -c commit.status=false rebase -i A &&
|
||||
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
|
||||
test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
|
||||
actual-combined-message &&
|
||||
test_cmp_rev HEAD^ A
|
||||
'
|
||||
|
@ -204,7 +204,7 @@ test_expect_success 'fixup -C works upon --autosquash with amend!' '
|
|||
--signoff A &&
|
||||
git diff-tree --exit-code --patch HEAD B3 -- &&
|
||||
test_cmp_rev HEAD^ A &&
|
||||
test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
|
||||
test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
|
||||
actual-squash-message
|
||||
'
|
||||
|
||||
|
|
|
@ -945,9 +945,9 @@ test_failing_trailer_option () {
|
|||
test_expect_success "$title" '
|
||||
# error message cannot be checked under i18n
|
||||
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
|
||||
test_i18ncmp expect actual &&
|
||||
test_cmp expect actual &&
|
||||
test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
|
||||
test_i18ncmp expect actual
|
||||
test_cmp expect actual
|
||||
'
|
||||
}
|
||||
|
||||
|
@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
|
|||
fatal: unrecognized %(contents) argument: trailersonly
|
||||
EOF
|
||||
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
|
||||
test_i18ncmp expect actual
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'basic atom: head contents:trailers' '
|
||||
|
|
|
@ -1025,13 +1025,6 @@ test_cmp_bin () {
|
|||
cmp "$@"
|
||||
}
|
||||
|
||||
# Wrapper for test_cmp which used to be used for
|
||||
# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
|
||||
# in-flight changes. Should not be used and will be removed soon.
|
||||
test_i18ncmp () {
|
||||
test_cmp "$@"
|
||||
}
|
||||
|
||||
# Wrapper for grep which used to be used for
|
||||
# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
|
||||
# in-flight changes. Should not be used and will be removed soon.
|
||||
|
|
Loading…
Reference in a new issue