[PATCH 0/1] t3434: mark successful test as such

[PATCH 0/1] t3434: mark successful test as such

[Elijah Newren via GitGitGadget]

t3434.3 was fixed a week ago, but no-one noticed. Mark it as such.

Elijah Newren (1):
  t3434: mark successful test as such

 t/t3434-rebase-i18n.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: ad05a3d8e5a6a06443836b5e40434262d992889a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-678%2Fnewren%2Ft3434-successful-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-678/newren/t3434-successful-v1
Pull-Request: https://github.com/git/git/pull/678
-- 
gitgitgadget

[PATCH 1/1] t3434: mark successful test as such

[Elijah Newren via GitGitGadget]

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