t9139 uses ancient, backwards-compatible iconv names

This resolves a semantic conflicts early to work with 5ae93df (t3900: use
ancient iconv names for backward compatibility, 2009-05-18).

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc builtin-log.c
Simple merge

diff --cc t/t9129-git-svn-i18n-commitencoding.sh
Simple merge

diff --cc t/t9139-git-svn-non-utf8-commitencoding.sh
index 2b1db97,0000000..f337959
mode 100755,000000..100755
--- 1/t/t9139-git-svn-non-utf8-commitencoding.sh
--- /dev/null
+++ b/t/t9139-git-svn-non-utf8-commitencoding.sh
@@@ -1,47 -1,0 +1,47 @@@
- for H in ISO-8859-1 EUCJP
 +#!/bin/sh
 +#
 +# Copyright (c) 2009 Eric Wong
 +
 +test_description='git svn refuses to dcommit non-UTF8 messages'
 +
 +. ./lib-git-svn.sh
 +
 +# ISO-2022-JP can pass for valid UTF-8, so skipping that in this test
 +
- for H in ISO-8859-1 EUCJP
++for H in ISO8859-1 eucJP
 +do
 +      test_expect_success "$H setup" '
 +              mkdir $H &&
 +              svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
 +              git svn clone "$svnrepo"/$H $H
 +      '
 +done
 +
- for H in ISO-8859-1 EUCJP
++for H in ISO8859-1 eucJP
 +do
 +      test_expect_success "$H commit on git side" '
 +      (
 +              cd $H &&
 +              git config i18n.commitencoding $H &&
 +              git checkout -b t refs/remotes/git-svn &&
 +              echo $H >F &&
 +              git add F &&
 +              git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
 +              E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
 +              test "z$E" = "z$H"
 +      )
 +      '
 +done
 +
++for H in ISO8859-1 eucJP
 +do
 +      test_expect_success "$H dcommit to svn" '
 +      (
 +              cd $H &&
 +              git config --unset i18n.commitencoding &&
 +              ! git svn dcommit
 +      )
 +      '
 +done
 +
 +test_done