t4041, t4205, t6006, t7102: don't hardcode tested encoding value

The tested encoding is always available in a variable. Use it instead of
hardcoding. Also, to be in line with other tests use ISO8859-1
(uppercase) rather then iso8859-1.

Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 1751c8330709c56a4b7019513e30434741847b95..463d63bde0f72bb5add9edff762e38f0b5b85ae5 100755 (executable)
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -11,6 +11,9 @@ This test tries to verify the sanity of the --submodule option of git diff.
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

+# Tested non-UTF-8 encoding
+test_encoding="ISO8859-1"
+

 # String "added" in German (translated with Google Translate), encoded in UTF-8,
 # used in sample commit log messages in add_file() function below.
 added=$(printf "hinzugef\303\274gt")
 # String "added" in German (translated with Google Translate), encoded in UTF-8,
 # used in sample commit log messages in add_file() function below.
 added=$(printf "hinzugef\303\274gt")


@@ -23,8 +26,8 @@ add_file () {
                        echo "$name" >"$name" &&
                        git add "$name" &&
                        test_tick &&
                        echo "$name" >"$name" &&
                        git add "$name" &&
                        test_tick &&

-                       msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t iso8859-1) &&
-                       git -c 'i18n.commitEncoding=iso8859-1' commit -m "$msg_added_iso88591"
+                       msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding) &&
+                       git -c "i18n.commitEncoding=$test_encoding" commit -m "$msg_added_iso88591"

                done >/dev/null &&
                git rev-parse --short --verify HEAD
        )
                done >/dev/null &&
                git rev-parse --short --verify HEAD
        )

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index f9f33aeab98662dd36ea1318fcc3580e32cca590..f5ea3f89324cbd62df3a678bed534b1c0c20b335 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -7,6 +7,9 @@
 test_description='Test pretty formats'
 . ./test-lib.sh
 
 test_description='Test pretty formats'
 . ./test-lib.sh
 

+# Tested non-UTF-8 encoding
+test_encoding="ISO8859-1"
+

 sample_utf8_part=$(printf "f\303\244ng")
 
 commit_msg () {
 sample_utf8_part=$(printf "f\303\244ng")
 
 commit_msg () {


@@ -27,8 +30,8 @@ test_expect_success 'set up basic repos' '
        >bar &&
        git add foo &&
        test_tick &&
        >bar &&
        git add foo &&
        test_tick &&

-       git config i18n.commitEncoding iso8859-1 &&
-       git commit -m "$(commit_msg iso8859-1)" &&
+       git config i18n.commitEncoding $test_encoding &&
+       git commit -m "$(commit_msg $test_encoding)" &&

        git add bar &&
        test_tick &&
        git commit -m "add bar" &&
        git add bar &&
        test_tick &&
        git commit -m "add bar" &&


@@ -56,8 +59,8 @@ test_expect_success 'alias user-defined format' '
        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 

-test_expect_success 'alias user-defined tformat with %s (iso8859-1 encoding)' '
-       git config i18n.logOutputEncoding iso8859-1 &&
+test_expect_success 'alias user-defined tformat with %s (ISO8859-1 encoding)' '
+       git config i18n.logOutputEncoding $test_encoding &&

        git log --oneline >expected-s &&
        git log --pretty="tformat:%h %s" >actual-s &&
        git config --unset i18n.logOutputEncoding &&
        git log --oneline >expected-s &&
        git log --pretty="tformat:%h %s" >actual-s &&
        git config --unset i18n.logOutputEncoding &&

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 9d9d9de08e1926525c24fc01c1217a96964fa1ee..692b0e5d72169afad741d8eb3f966574d2c63954 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -9,19 +9,22 @@ test_description='git rev-list --pretty=format test'
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_tick
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_tick

+# Tested non-UTF-8 encoding
+test_encoding="ISO8859-1"
+

 # String "added" in German
 # (translated with Google Translate),
 # encoded in UTF-8, used as a commit log message below.
 added=$(printf "added (hinzugef\303\274gt) foo")
 # String "added" in German
 # (translated with Google Translate),
 # encoded in UTF-8, used as a commit log message below.
 added=$(printf "added (hinzugef\303\274gt) foo")

-added_iso88591=$(echo "$added" | iconv -f utf-8 -t iso8859-1)
+added_iso88591=$(echo "$added" | iconv -f utf-8 -t $test_encoding)

 # same but "changed"
 changed=$(printf "changed (ge\303\244ndert) foo")
 # same but "changed"
 changed=$(printf "changed (ge\303\244ndert) foo")

-changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t iso8859-1)
+changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding)

 
 test_expect_success 'setup' '
        : >foo &&
        git add foo &&
 
 test_expect_success 'setup' '
        : >foo &&
        git add foo &&

-       git config i18n.commitEncoding iso8859-1 &&
+       git config i18n.commitEncoding $test_encoding &&

        git commit -m "$added_iso88591" &&
        head1=$(git rev-parse --verify HEAD) &&
        head1_short=$(git rev-parse --verify --short $head1) &&
        git commit -m "$added_iso88591" &&
        head1=$(git rev-parse --verify HEAD) &&
        head1_short=$(git rev-parse --verify --short $head1) &&


@@ -124,9 +127,9 @@ EOF
 
 test_format encoding %e <<EOF
 commit $head2
 
 test_format encoding %e <<EOF
 commit $head2

-iso8859-1
+$test_encoding

 commit $head1
 commit $head1

-iso8859-1
+$test_encoding

 EOF
 
 test_format subject %s <<EOF
 EOF
 
 test_format subject %s <<EOF


@@ -203,16 +206,16 @@ test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '
        )
 '
 
        )
 '
 

-iconv -f utf-8 -t iso8859-1 > commit-msg <<EOF
+iconv -f utf-8 -t $test_encoding > commit-msg <<EOF

 Test printing of complex bodies
 
 This commit message is much longer than the others,
 Test printing of complex bodies
 
 This commit message is much longer than the others,

-and it will be encoded in iso8859-1. We should therefore
-include an iso8859 character: ¡bueno!
+and it will be encoded in $test_encoding. We should therefore
+include an ISO8859 character: ¡bueno!

 EOF
 
 test_expect_success 'setup complex body' '
 EOF
 
 test_expect_success 'setup complex body' '

-       git config i18n.commitencoding iso8859-1 &&
+       git config i18n.commitencoding $test_encoding &&

        echo change2 >foo && git commit -a -F commit-msg &&
        head3=$(git rev-parse --verify HEAD) &&
        head3_short=$(git rev-parse --short $head3)
        echo change2 >foo && git commit -a -F commit-msg &&
        head3=$(git rev-parse --verify HEAD) &&
        head3_short=$(git rev-parse --short $head3)


@@ -220,11 +223,11 @@ test_expect_success 'setup complex body' '
 
 test_format complex-encoding %e <<EOF
 commit $head3
 
 test_format complex-encoding %e <<EOF
 commit $head3

-iso8859-1
+$test_encoding

 commit $head2
 commit $head2

-iso8859-1
+$test_encoding

 commit $head1
 commit $head1

-iso8859-1
+$test_encoding

 EOF
 
 test_format complex-subject %s <<EOF
 EOF
 
 test_format complex-subject %s <<EOF


@@ -240,16 +243,16 @@ test_expect_success 'prepare expected messages (for test %b)' '
        cat <<-EOF >expected.utf-8 &&
        commit $head3
        This commit message is much longer than the others,
        cat <<-EOF >expected.utf-8 &&
        commit $head3
        This commit message is much longer than the others,

-       and it will be encoded in iso8859-1. We should therefore
-       include an iso8859 character: ¡bueno!
+       and it will be encoded in $test_encoding. We should therefore
+       include an ISO8859 character: ¡bueno!

 
        commit $head2
        commit $head1
        EOF
 
        commit $head2
        commit $head1
        EOF

-       iconv -f utf-8 -t iso8859-1 expected.utf-8 >expected.iso8859-1
+       iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1

 '
 
 '
 

-test_format complex-body %b <expected.iso8859-1
+test_format complex-body %b <expected.ISO8859-1

 
 # Git uses i18n.commitEncoding if no i18n.logOutputEncoding set
 # so unset i18n.commitEncoding to test encoding conversion
 
 # Git uses i18n.commitEncoding if no i18n.logOutputEncoding set
 # so unset i18n.commitEncoding to test encoding conversion

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 450529404c686469ed5ba5ad465cf8b3ef651ef9..ee703bed64cc7572cb9a86fce2b0157026475709 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -22,6 +22,9 @@ commit_msg () {
        fi
 }
 
        fi
 }
 

+# Tested non-UTF-8 encoding
+test_encoding="ISO8859-1"
+

 test_expect_success 'creating initial files and commits' '
        test_tick &&
        echo "1st file" >first &&
 test_expect_success 'creating initial files and commits' '
        test_tick &&
        echo "1st file" >first &&


@@ -41,7 +44,7 @@ test_expect_success 'creating initial files and commits' '
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&

-       git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
+       git -c "i18n.commitEncoding=$test_encoding" commit -a -m "$(commit_msg $test_encoding)" &&

        head5=$(git rev-parse --verify HEAD)
 '
 # git log --pretty=oneline # to see those SHA1 involved
        head5=$(git rev-parse --verify HEAD)
 '
 # git log --pretty=oneline # to see those SHA1 involved


@@ -64,10 +67,10 @@ test_expect_success 'reset --hard message' '
        test_cmp .expected .actual
 '
 
        test_cmp .expected .actual
 '
 

-test_expect_success 'reset --hard message (iso8859-1 logoutputencoding)' '
+test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '

        hex=$(git log -1 --format="%h") &&
        hex=$(git log -1 --format="%h") &&

-       git -c "i18n.logOutputEncoding=iso8859-1" reset --hard > .actual &&
-       echo HEAD is now at $hex $(commit_msg iso8859-1) > .expected &&
+       git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
+       echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&

        test_cmp .expected .actual
 '
 
        test_cmp .expected .actual
 '
 


@@ -331,7 +334,7 @@ test_expect_success 'redoing the last two commits should succeed' '
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&

-       git -c "i18n.commitEncoding=iso8859-1" commit -a -m "$(commit_msg iso8859-1)" &&
+       git -c "i18n.commitEncoding=$test_encoding" commit -a -m "$(commit_msg $test_encoding)" &&

        check_changes $head5
 '
 
        check_changes $head5
 '