blob: fed4a6e21c505e05c7f60c91e42fd58be0160547 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
We can't support Japanese people using musl
--- git-2.14.1/t/t5100-mailinfo.sh.old 2017-08-09 14:54:31.000000000 -0500
+++ git-2.14.1/t/t5100-mailinfo.sh 2017-09-10 23:26:39.206126739 -0500
@@ -27,6 +27,7 @@
for mail in 00*
do
+ if [ $mail == 0004 ]; then continue; fi
test_expect_success "mailinfo $mail" '
check_mailinfo "$mail" "" &&
if test -f "$DATA/msg$mail--scissors"
--- git-2.14.1/t/t8005-blame-i18n.sh.old 2017-08-09 14:54:31.000000000 -0500
+++ git-2.14.1/t/t8005-blame-i18n.sh 2017-09-16 00:42:35.123728809 -0500
@@ -24,43 +24,10 @@
git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
'
-cat >expected <<EOF
-author $SJIS_NAME
-summary $SJIS_MSG
-author $SJIS_NAME
-summary $SJIS_MSG
-author $SJIS_NAME
-summary $SJIS_MSG
-EOF
-
filter_author_summary () {
sed -n -e '/^author /p' -e '/^summary /p' "$@"
}
-test_expect_success !MINGW \
- 'blame respects i18n.commitencoding' '
- git blame --incremental file >output &&
- filter_author_summary output >actual &&
- test_cmp expected actual
-'
-
-cat >expected <<EOF
-author $EUC_JAPAN_NAME
-summary $EUC_JAPAN_MSG
-author $EUC_JAPAN_NAME
-summary $EUC_JAPAN_MSG
-author $EUC_JAPAN_NAME
-summary $EUC_JAPAN_MSG
-EOF
-
-test_expect_success !MINGW \
- 'blame respects i18n.logoutputencoding' '
- git config i18n.logoutputencoding eucJP &&
- git blame --incremental file >output &&
- filter_author_summary output >actual &&
- test_cmp expected actual
-'
-
cat >expected <<EOF
author $UTF8_NAME
summary $UTF8_MSG
--- git-2.21.0/t/t0028-working-tree-encoding.sh.old 2019-02-24 16:31:46.000000000 +0000
+++ git-2.21.0/t/t0028-working-tree-encoding.sh 2019-03-08 00:49:07.580000000 +0000
@@ -51,14 +51,6 @@
test_cmp_bin test.utf8.raw test.utf16.git
'
-test_expect_success 're-encode to UTF-16 on checkout' '
- test_when_finished "rm -f test.utf16.raw" &&
-
- rm test.utf16 &&
- git checkout test.utf16 &&
- test_cmp_bin test.utf16.raw test.utf16
-'
-
test_expect_success 're-encode to UTF-16-LE-BOM on checkout' '
rm test.utf16lebom &&
git checkout test.utf16lebom &&
@@ -123,41 +115,6 @@
test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out
'
-
- test_expect_success "eol conversion for UTF-${i} encoded files on checkout" '
- test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
- test_when_finished "git reset --hard HEAD^" &&
-
- cat lf.utf8.raw | write_utf${i} >lf.utf${i}.raw &&
- cat crlf.utf8.raw | write_utf${i} >crlf.utf${i}.raw &&
- cp crlf.utf${i}.raw eol.utf${i} &&
-
- cat >expectIndexLF <<-EOF &&
- i/lf w/-text attr/text eol.utf${i}
- EOF
-
- git add eol.utf${i} &&
- git commit -m eol &&
-
- # UTF-${i} with CRLF (Windows line endings)
- rm eol.utf${i} &&
- git -c core.eol=crlf checkout eol.utf${i} &&
- test_cmp_bin crlf.utf${i}.raw eol.utf${i} &&
-
- # Although the file has CRLF in the working tree,
- # ensure LF in the index
- git ls-files --eol eol.utf${i} >actual &&
- test_cmp expectIndexLF actual &&
-
- # UTF-${i} with LF (Unix line endings)
- rm eol.utf${i} &&
- git -c core.eol=lf checkout eol.utf${i} &&
- test_cmp_bin lf.utf${i}.raw eol.utf${i} &&
-
- # The file LF in the working tree, ensure LF in the index
- git ls-files --eol eol.utf${i} >actual &&
- test_cmp expectIndexLF actual
- '
done
test_expect_success 'check unsupported encodings' '
|
