mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
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>
29 lines
898 B
Bash
29 lines
898 B
Bash
# Helps shared by the test scripts for comparing log graphs.
|
|
|
|
sanitize_log_output () {
|
|
sed -e 's/ *$//' \
|
|
-e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
|
|
-e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
|
|
-e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
|
|
-e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
|
|
-e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/'
|
|
}
|
|
|
|
lib_test_cmp_graph () {
|
|
git log --graph "$@" >output &&
|
|
sed 's/ *$//' >output.sanitized <output &&
|
|
test_cmp expect output.sanitized
|
|
}
|
|
|
|
lib_test_cmp_short_graph () {
|
|
git log --graph --pretty=short "$@" >output &&
|
|
sanitize_log_output >output.sanitized <output &&
|
|
test_cmp expect output.sanitized
|
|
}
|
|
|
|
lib_test_cmp_colored_graph () {
|
|
git log --graph --color=always "$@" >output.colors.raw &&
|
|
test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors &&
|
|
test_cmp expect.colors output.colors
|
|
}
|