t3434: mark successful test as such

newren · gitster · commit 12029dc57db2 · 2019-12-18T13:06:14.000-08:00
t3434.3 was fixed by commit 917d0d6 ("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>
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' '`
`45`	`45`	`compare_msg eucJP.txt eucJP UTF-8`
`46`	`46`	`'`
`47`	`47`
`48`		`-test_expect_failure 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' '`
	`48`	`+test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' '`
`49`	`49`	`git switch -c merge-eucJP-ISO-2022-JP first &&`
`50`	`50`	`git config i18n.commitencoding eucJP &&`
`51`	`51`	`git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&`