On platforms with a broken iconv it may be necessary to skip the fourth test in this script. Test four sets the i18n.commitencoding config variable. If test four is skipped, then a later unset of the i18n.commitencoding config variable will return a non-zero exit status and cause a test to fail. So move the 'config --unset' into its own test function which allows it to be skipped independently. Signed-off-by: Brandon Casey <casey@xxxxxxxxxxxxxxx> --- t/t9301-fast-export.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index 3cb9f80..41d444d 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -185,12 +185,17 @@ test_expect_success 'submodule fast-export | fast-import' ' ' +test_expect_success 'unset i18n.commitencoding' ' + + git config --unset i18n.commitencoding + +' + export GIT_AUTHOR_NAME='A U Thor' export GIT_COMMITTER_NAME='C O Mitter' test_expect_success 'setup copies' ' - git config --unset i18n.commitencoding && git checkout -b copy rein && git mv file file3 && git commit -m move1 && -- 1.6.0.21.g35a2e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
