[PATCH 1/1] t3434: mark successful test as such
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 13, 2019, 21:03 UTC
- Message-ID
- <2d1f9a8485e744e23b1f02826877afe829a639cf.1576271025.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.678.git.git.1576271025.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
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> --- t/t3434-rebase-i18n.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3434-rebase-i18n.sh b/t/t3434-rebase-i18n.sh index 4b5b128cd6..c7c835cde9 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 &&
-- gitgitgadget