Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2006 Junio C Hamano |
| 4 | # |
| 5 | |
| 6 | test_description='commit and log output encodings' |
| 7 | |
| 8 | . ./test-lib.sh |
| 9 | |
| 10 | compare_with () { |
Linus Torvalds | 304b5af | 2007-10-09 09:35:22 -0700 | [diff] [blame] | 11 | git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current && |
Junio C Hamano | eb12788 | 2009-05-12 02:01:51 -0700 | [diff] [blame] | 12 | case "$3" in |
| 13 | '') |
| 14 | test_cmp "$2" current ;; |
| 15 | ?*) |
Alex Riesen | 39d404d | 2009-05-14 14:55:54 +0200 | [diff] [blame] | 16 | iconv -f "$3" -t UTF-8 >current.utf8 <current && |
| 17 | iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" && |
Junio C Hamano | eb12788 | 2009-05-12 02:01:51 -0700 | [diff] [blame] | 18 | test_cmp expect.utf8 current.utf8 |
| 19 | ;; |
| 20 | esac |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 21 | } |
| 22 | |
| 23 | test_expect_success setup ' |
| 24 | : >F && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 25 | git add F && |
| 26 | T=$(git write-tree) && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 27 | C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 28 | git update-ref HEAD $C && |
Nanako Shiraishi | 0cb0e14 | 2008-09-03 17:59:27 +0900 | [diff] [blame] | 29 | git tag C0 |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 30 | ' |
| 31 | |
| 32 | test_expect_success 'no encoding header for base case' ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 33 | E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") && |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 34 | test z = "z$E" |
| 35 | ' |
| 36 | |
Junio C Hamano | 0ed45a1 | 2013-08-05 09:47:11 -0700 | [diff] [blame] | 37 | test_expect_success 'UTF-16 refused because of NULs' ' |
Nguyễn Thái Ngọc Duy | 37576c1 | 2011-12-15 20:47:23 +0700 | [diff] [blame] | 38 | echo UTF-16 >F && |
Junio C Hamano | 0ed45a1 | 2013-08-05 09:47:11 -0700 | [diff] [blame] | 39 | test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt |
Nguyễn Thái Ngọc Duy | 37576c1 | 2011-12-15 20:47:23 +0700 | [diff] [blame] | 40 | ' |
| 41 | |
brian m. carlson | 28110d4 | 2013-07-04 17:19:43 +0000 | [diff] [blame] | 42 | test_expect_success 'UTF-8 invalid characters refused' ' |
Beat Bolli | 36a6f49 | 2018-01-10 10:58:32 +0100 | [diff] [blame] | 43 | test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" && |
brian m. carlson | 28110d4 | 2013-07-04 17:19:43 +0000 | [diff] [blame] | 44 | echo "UTF-8 characters" >F && |
| 45 | printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \ |
| 46 | >"$HOME/invalid" && |
| 47 | git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && |
Vasco Almeida | 4fa4b31 | 2016-09-19 13:08:16 +0000 | [diff] [blame] | 48 | test_i18ngrep "did not conform" "$HOME"/stderr |
brian m. carlson | 28110d4 | 2013-07-04 17:19:43 +0000 | [diff] [blame] | 49 | ' |
Nguyễn Thái Ngọc Duy | 37576c1 | 2011-12-15 20:47:23 +0700 | [diff] [blame] | 50 | |
brian m. carlson | e82bd6c | 2013-07-04 17:20:34 +0000 | [diff] [blame] | 51 | test_expect_success 'UTF-8 overlong sequences rejected' ' |
Beat Bolli | 36a6f49 | 2018-01-10 10:58:32 +0100 | [diff] [blame] | 52 | test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" && |
brian m. carlson | e82bd6c | 2013-07-04 17:20:34 +0000 | [diff] [blame] | 53 | rm -f "$HOME/stderr" "$HOME/invalid" && |
| 54 | echo "UTF-8 overlong" >F && |
| 55 | printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \ |
| 56 | >"$HOME/invalid" && |
| 57 | git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && |
Vasco Almeida | 4fa4b31 | 2016-09-19 13:08:16 +0000 | [diff] [blame] | 58 | test_i18ngrep "did not conform" "$HOME"/stderr |
brian m. carlson | e82bd6c | 2013-07-04 17:20:34 +0000 | [diff] [blame] | 59 | ' |
| 60 | |
Peter Krefting | 81050ac | 2013-07-09 12:16:33 +0100 | [diff] [blame] | 61 | test_expect_success 'UTF-8 non-characters refused' ' |
Beat Bolli | 36a6f49 | 2018-01-10 10:58:32 +0100 | [diff] [blame] | 62 | test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" && |
Peter Krefting | 81050ac | 2013-07-09 12:16:33 +0100 | [diff] [blame] | 63 | echo "UTF-8 non-character 1" >F && |
| 64 | printf "Commit message\n\nNon-character:\364\217\277\276\n" \ |
| 65 | >"$HOME/invalid" && |
| 66 | git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && |
Vasco Almeida | 4fa4b31 | 2016-09-19 13:08:16 +0000 | [diff] [blame] | 67 | test_i18ngrep "did not conform" "$HOME"/stderr |
Peter Krefting | 81050ac | 2013-07-09 12:16:33 +0100 | [diff] [blame] | 68 | ' |
| 69 | |
| 70 | test_expect_success 'UTF-8 non-characters refused' ' |
Beat Bolli | 36a6f49 | 2018-01-10 10:58:32 +0100 | [diff] [blame] | 71 | test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" && |
Peter Krefting | 81050ac | 2013-07-09 12:16:33 +0100 | [diff] [blame] | 72 | echo "UTF-8 non-character 2." >F && |
| 73 | printf "Commit message\n\nNon-character:\357\267\220\n" \ |
| 74 | >"$HOME/invalid" && |
| 75 | git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && |
Vasco Almeida | 4fa4b31 | 2016-09-19 13:08:16 +0000 | [diff] [blame] | 76 | test_i18ngrep "did not conform" "$HOME"/stderr |
Peter Krefting | 81050ac | 2013-07-09 12:16:33 +0100 | [diff] [blame] | 77 | ' |
| 78 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 79 | for H in ISO8859-1 eucJP ISO-2022-JP |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 80 | do |
| 81 | test_expect_success "$H setup" ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 82 | git config i18n.commitencoding $H && |
Nanako Shiraishi | 0cb0e14 | 2008-09-03 17:59:27 +0900 | [diff] [blame] | 83 | git checkout -b $H C0 && |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 84 | echo $H >F && |
Junio C Hamano | 9b8ae93 | 2008-09-03 16:08:23 -0700 | [diff] [blame] | 85 | git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 86 | ' |
| 87 | done |
| 88 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 89 | for H in ISO8859-1 eucJP ISO-2022-JP |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 90 | do |
| 91 | test_expect_success "check encoding header for $H" ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 92 | E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") && |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 93 | test "z$E" = "z'$H'" |
| 94 | ' |
| 95 | done |
| 96 | |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 97 | test_expect_success 'config to remove customization' ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 98 | git config --unset-all i18n.commitencoding && |
| 99 | if Z=$(git config --get-all i18n.commitencoding) |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 100 | then |
| 101 | echo Oops, should have failed. |
| 102 | false |
| 103 | else |
| 104 | test z = "z$Z" |
| 105 | fi && |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 106 | git config i18n.commitencoding UTF-8 |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 107 | ' |
| 108 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 109 | test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' |
| 110 | compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 111 | ' |
| 112 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 113 | for H in eucJP ISO-2022-JP |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 114 | do |
| 115 | test_expect_success "$H should be shown in UTF-8 now" ' |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 116 | compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 117 | ' |
| 118 | done |
| 119 | |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 120 | test_expect_success 'config to add customization' ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 121 | git config --unset-all i18n.commitencoding && |
| 122 | if Z=$(git config --get-all i18n.commitencoding) |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 123 | then |
| 124 | echo Oops, should have failed. |
| 125 | false |
| 126 | else |
| 127 | test z = "z$Z" |
| 128 | fi |
| 129 | ' |
| 130 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 131 | for H in ISO8859-1 eucJP ISO-2022-JP |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 132 | do |
| 133 | test_expect_success "$H should be shown in itself now" ' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 134 | git config i18n.commitencoding '$H' && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 135 | compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 136 | ' |
| 137 | done |
| 138 | |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 139 | test_expect_success 'config to tweak customization' ' |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 140 | git config i18n.logoutputencoding UTF-8 |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 141 | ' |
| 142 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 143 | test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' |
| 144 | compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 145 | ' |
| 146 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 147 | for H in eucJP ISO-2022-JP |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 148 | do |
| 149 | test_expect_success "$H should be shown in UTF-8 now" ' |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 150 | compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 151 | ' |
| 152 | done |
| 153 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 154 | for J in eucJP ISO-2022-JP |
Junio C Hamano | 7255ff0 | 2006-12-28 17:36:35 -0800 | [diff] [blame] | 155 | do |
Junio C Hamano | eb12788 | 2009-05-12 02:01:51 -0700 | [diff] [blame] | 156 | if test "$J" = ISO-2022-JP |
| 157 | then |
| 158 | ICONV=$J |
| 159 | else |
| 160 | ICONV= |
| 161 | fi |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 162 | git config i18n.logoutputencoding $J |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 163 | for H in eucJP ISO-2022-JP |
Junio C Hamano | 7255ff0 | 2006-12-28 17:36:35 -0800 | [diff] [blame] | 164 | do |
| 165 | test_expect_success "$H should be shown in $J now" ' |
Junio C Hamano | eb12788 | 2009-05-12 02:01:51 -0700 | [diff] [blame] | 166 | compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV |
Junio C Hamano | 7255ff0 | 2006-12-28 17:36:35 -0800 | [diff] [blame] | 167 | ' |
| 168 | done |
| 169 | done |
| 170 | |
Brandon Casey | 5ae93df | 2009-05-18 18:44:38 -0500 | [diff] [blame] | 171 | for H in ISO8859-1 eucJP ISO-2022-JP |
Junio C Hamano | 0007928 | 2006-12-30 02:35:14 -0800 | [diff] [blame] | 172 | do |
| 173 | test_expect_success "No conversion with $H" ' |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 174 | compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt |
Junio C Hamano | 0007928 | 2006-12-30 02:35:14 -0800 | [diff] [blame] | 175 | ' |
| 176 | done |
| 177 | |
Pat Notz | b1a6c0a | 2010-11-02 13:59:10 -0600 | [diff] [blame] | 178 | test_commit_autosquash_flags () { |
| 179 | H=$1 |
| 180 | flag=$2 |
| 181 | test_expect_success "commit --$flag with $H encoding" ' |
| 182 | git config i18n.commitencoding $H && |
| 183 | git checkout -b $H-$flag C0 && |
| 184 | echo $H >>F && |
| 185 | git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt && |
| 186 | test_tick && |
| 187 | echo intermediate stuff >>G && |
| 188 | git add G && |
| 189 | git commit -a -m "intermediate commit" && |
| 190 | test_tick && |
| 191 | echo $H $flag >>F && |
Johannes Sixt | 23ce5c3 | 2011-08-11 09:05:48 +0200 | [diff] [blame] | 192 | git commit -a --$flag HEAD~1 && |
Pat Notz | b1a6c0a | 2010-11-02 13:59:10 -0600 | [diff] [blame] | 193 | E=$(git cat-file commit '$H-$flag' | |
| 194 | sed -ne "s/^encoding //p") && |
| 195 | test "z$E" = "z$H" && |
| 196 | git config --unset-all i18n.commitencoding && |
| 197 | git rebase --autosquash -i HEAD^^^ && |
| 198 | git log --oneline >actual && |
Stefano Lattarini | 3fb0459 | 2012-04-11 13:24:01 +0200 | [diff] [blame] | 199 | test_line_count = 3 actual |
Pat Notz | b1a6c0a | 2010-11-02 13:59:10 -0600 | [diff] [blame] | 200 | ' |
| 201 | } |
| 202 | |
| 203 | test_commit_autosquash_flags eucJP fixup |
| 204 | |
Johannes Sixt | 23ce5c3 | 2011-08-11 09:05:48 +0200 | [diff] [blame] | 205 | test_commit_autosquash_flags ISO-2022-JP squash |
Pat Notz | 7951bd3 | 2010-11-02 13:59:12 -0600 | [diff] [blame] | 206 | |
Junio C Hamano | d2c11a3 | 2006-12-27 16:41:33 -0800 | [diff] [blame] | 207 | test_done |