diff options
| author | Elijah Newren <newren@gmail.com> | 2019-12-13 21:03:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-18 21:06:14 (GMT) |
| commit | 12029dc57db23baef008e77db1909367599210ee (patch) | |
| tree | 8a16f9178c7f86aad33a957958ca45f452f76bea /t/t3434-rebase-i18n.sh | |
| parent | b02fd2accad4d48078671adf38fe5b5976d77304 (diff) | |
| download | git-12029dc57db23baef008e77db1909367599210ee.zip git-12029dc57db23baef008e77db1909367599210ee.tar.gz git-12029dc57db23baef008e77db1909367599210ee.tar.bz2 | |
t3434: mark successful test as such
t3434.3 was fixed by commit 917d0d6234be ("Merge branch
'js/rebase-r-safer-label'", 2019-12-05). t3434 did not exist in
js/rebase-r-safer-label, so could not have marked the test as fixed, and
it was probably not noticed that the merge fixed this test. Mark it as
fixed now.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3434-rebase-i18n.sh')
| -rwxr-xr-x | t/t3434-rebase-i18n.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3434-rebase-i18n.sh b/t/t3434-rebase-i18n.sh index 4b5b128..c7c835c 100755 --- a/t/t3434-rebase-i18n.sh +++ b/t/t3434-rebase-i18n.sh @@ -45,7 +45,7 @@ test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' compare_msg eucJP.txt eucJP UTF-8 ' -test_expect_failure 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' +test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' git switch -c merge-eucJP-ISO-2022-JP first && git config i18n.commitencoding eucJP && git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && |