tests: remove most uses of test_i18ncmp
As a follow-up to d162b25f956 (tests: remove support for GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp via a simple s/test_i18ncmp/test_cmp/g search-replacement. I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight changes between "master" and "seen", as well as the prerequisite itself due to other changes between "master" and "next/seen" which add new test_i18ncmp uses. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 11, 2021 at 02:53 UTC
1108cea7f8ee38a8507c1cc68d1fafe2eb31d623
90 files changed
+415
-415
t/lib-credential.sh
+1
-1
@@ -20,7 +20,7 @@ check() {
20
false
21
fi &&
22
test_cmp expect-stdout stdout &&
23
- test_i18ncmp expect-stderr stderr
23
+ test_cmp expect-stderr stderr
24
}
25
26
read_chunk() {
t/lib-log-graph.sh
+2
-2
@@ -12,13 +12,13 @@ sanitize_log_output () {
12
lib_test_cmp_graph () {
13
git log --graph "$@" >output &&
14
sed 's/ *$//' >output.sanitized <output &&
15
- test_i18ncmp expect output.sanitized
15
+ test_cmp expect output.sanitized
16
}
17
18
lib_test_cmp_short_graph () {
19
git log --graph --pretty=short "$@" >output &&
20
sanitize_log_output >output.sanitized <output &&
21
- test_i18ncmp expect output.sanitized
21
+ test_cmp expect output.sanitized
22
}
23
24
lib_test_cmp_colored_graph () {
t/t0006-date.sh
+2
-2
@@ -11,7 +11,7 @@ check_relative() {
11
echo "$t -> $2" >expect
12
test_expect_${3:-success} "relative date ($2)" "
13
test-tool date relative $t >actual &&
14
- test_i18ncmp expect actual
14
+ test_cmp expect actual
15
"
16
}
17
@@ -139,7 +139,7 @@ check_date_format_human() {
139
echo "$t -> $2" >expect
140
test_expect_success "human date $t" '
141
test-tool date human $t >actual &&
142
- test_i18ncmp expect actual
142
+ test_cmp expect actual
143
'
144
}
145
t/t0008-ignores.sh
+1
-1
@@ -34,7 +34,7 @@ expect_from_stdin () {
34
test_stderr () {
35
expected="$1"
36
expect_in stderr "$1" &&
37
- test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
37
+ test_cmp "$HOME/expected-stderr" "$HOME/stderr"
38
}
39
40
broken_c_unquote () {
t/t0012-help.sh
+1
-1
@@ -55,7 +55,7 @@ test_expect_success "--help does not work for guides" "
55
git: 'revisions' is not a git command. See 'git --help'.
56
EOF
57
test_must_fail git revisions --help 2>actual &&
58
- test_i18ncmp expect actual
58
+ test_cmp expect actual
59
"
60
61
test_expect_success 'git help' '
t/t0018-advice.sh
+2
-2
@@ -10,7 +10,7 @@ test_expect_success 'advice should be printed when config variable is unset' '
10
hint: Disable this message with "git config advice.nestedTag false"
11
EOF
12
test-tool advise "This is a piece of advice" 2>actual &&
13
- test_i18ncmp expect actual
13
+ test_cmp expect actual
14
'
15
16
test_expect_success 'advice should be printed when config variable is set to true' '
@@ -20,7 +20,7 @@ test_expect_success 'advice should be printed when config variable is set to tru
20
EOF
21
test_config advice.nestedTag true &&
22
test-tool advise "This is a piece of advice" 2>actual &&
23
- test_i18ncmp expect actual
23
+ test_cmp expect actual
24
'
25
26
test_expect_success 'advice should not be printed when config variable is set to false' '
t/t0027-auto-crlf.sh
+1
-1
@@ -83,7 +83,7 @@ check_warning () {
83
*) echo >&2 "Illegal 1": "$1" ; return false ;;
84
esac
85
grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq >"$2".actual
86
- test_i18ncmp "$2".expect "$2".actual
86
+ test_cmp "$2".expect "$2".actual
87
}
88
89
commit_check_warn () {
t/t0040-parse-options.sh
+4
-4
@@ -61,7 +61,7 @@ EOF
61
test_expect_success 'test help' '
62
test_must_fail test-tool parse-options -h >output 2>output.err &&
63
test_must_be_empty output.err &&
64
- test_i18ncmp expect output
64
+ test_cmp expect output
65
'
66
67
mv expect expect.err
@@ -84,7 +84,7 @@ check_unknown_i18n() {
84
cat expect.err >>expect &&
85
test_must_fail test-tool parse-options $* >output 2>output.err &&
86
test_must_be_empty output &&
87
- test_i18ncmp expect output.err
87
+ test_cmp expect output.err
88
}
89
90
test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes'
@@ -250,7 +250,7 @@ EOF
250
test_expect_success 'detect possible typos' '
251
test_must_fail test-tool parse-options -boolean >output 2>output.err &&
252
test_must_be_empty output &&
253
- test_i18ncmp typo.err output.err
253
+ test_cmp typo.err output.err
254
'
255
256
cat >typo.err <<\EOF
@@ -260,7 +260,7 @@ EOF
260
test_expect_success 'detect possible typos' '
261
test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
262
test_must_be_empty output &&
263
- test_i18ncmp typo.err output.err
263
+ test_cmp typo.err output.err
264
'
265
266
test_expect_success 'keep some options as arguments' '
t/t0201-gettext-fallbacks.sh
+7
-7
@@ -27,25 +27,25 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
27
test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
28
printf "test" >expect &&
29
gettext "test" >actual &&
30
- test_i18ncmp expect actual &&
30
+ test_cmp expect actual &&
31
printf "test more words" >expect &&
32
gettext "test more words" >actual &&
33
- test_i18ncmp expect actual
33
+ test_cmp expect actual
34
'
35
36
test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
37
printf "test" >expect &&
38
eval_gettext "test" >actual &&
39
- test_i18ncmp expect actual &&
39
+ test_cmp expect actual &&
40
printf "test more words" >expect &&
41
eval_gettext "test more words" >actual &&
42
- test_i18ncmp expect actual
42
+ test_cmp expect actual
43
'
44
45
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
46
printf "test YesPlease" >expect &&
47
GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
48
- test_i18ncmp expect actual
48
+ test_cmp expect actual
49
'
50
51
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
@@ -53,7 +53,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
53
export cmdline &&
54
printf "When you have resolved this problem, run git am --resolved." >expect &&
55
eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
56
- test_i18ncmp expect actual
56
+ test_cmp expect actual
57
'
58
59
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
@@ -61,7 +61,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
61
export cmdline &&
62
printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
63
eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
64
- test_i18ncmp expect actual
64
+ test_cmp expect actual
65
'
66
67
test_done
t/t0300-credentials.sh
+4
-4
@@ -578,7 +578,7 @@ test_expect_success 'helpers can abort the process' '
578
quit: host=example.com
579
fatal: credential helper '\''quit'\'' told us to quit
580
EOF
581
- test_i18ncmp expect stderr
581
+ test_cmp expect stderr
582
'
583
584
test_expect_success 'empty helper spec resets helper list' '
@@ -606,7 +606,7 @@ test_expect_success 'url parser rejects embedded newlines' '
606
warning: url contains a newline in its path component: https://one.example.com?%0ahost=two.example.com/
607
fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/
608
EOF
609
- test_i18ncmp expect stderr
609
+ test_cmp expect stderr
610
'
611
612
test_expect_success 'host-less URLs are parsed as empty host' '
@@ -633,7 +633,7 @@ test_expect_success 'credential system refuses to work with missing host' '
633
cat >expect <<-\EOF &&
634
fatal: refusing to work with credential missing host field
635
EOF
636
- test_i18ncmp expect stderr
636
+ test_cmp expect stderr
637
'
638
639
test_expect_success 'credential system refuses to work with missing protocol' '
@@ -643,7 +643,7 @@ test_expect_success 'credential system refuses to work with missing protocol' '
643
cat >expect <<-\EOF &&
644
fatal: refusing to work with credential missing protocol field
645
EOF
646
- test_i18ncmp expect stderr
646
+ test_cmp expect stderr
647
'
648
649
# usage: check_host_and_path <url> <expected-host> <expected-path>
t/t0500-progress-display.sh
+11
-11
@@ -29,7 +29,7 @@ test_expect_success 'simple progress display' '
29
test-tool progress "Working hard" <in 2>stderr &&
30
31
show_cr <stderr >out &&
32
- test_i18ncmp expect out
32
+ test_cmp expect out
33
'
34
35
test_expect_success 'progress display with total' '
@@ -48,7 +48,7 @@ test_expect_success 'progress display with total' '
48
test-tool progress --total=3 "Working hard" <in 2>stderr &&
49
50
show_cr <stderr >out &&
51
- test_i18ncmp expect out
51
+ test_cmp expect out
52
'
53
54
test_expect_success 'progress display breaks long lines #1' '
@@ -72,7 +72,7 @@ EOF
72
<in 2>stderr &&
73
74
show_cr <stderr >out &&
75
- test_i18ncmp expect out
75
+ test_cmp expect out
76
'
77
78
test_expect_success 'progress display breaks long lines #2' '
@@ -100,7 +100,7 @@ EOF
100
<in 2>stderr &&
101
102
show_cr <stderr >out &&
103
- test_i18ncmp expect out
103
+ test_cmp expect out
104
'
105
106
test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
@@ -126,7 +126,7 @@ EOF
126
<in 2>stderr &&
127
128
show_cr <stderr >out &&
129
- test_i18ncmp expect out
129
+ test_cmp expect out
130
'
131
132
test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' '
@@ -150,7 +150,7 @@ EOF
150
<in 2>stderr &&
151
152
show_cr <stderr >out &&
153
- test_i18ncmp expect out
153
+ test_cmp expect out
154
'
155
156
# Progress counter goes backwards, this should not happen in practice.
@@ -172,7 +172,7 @@ test_expect_success 'progress shortens - crazy caller' '
172
test-tool progress --total=1000 "Working hard" <in 2>stderr &&
173
174
show_cr <stderr >out &&
175
- test_i18ncmp expect out
175
+ test_cmp expect out
176
'
177
178
test_expect_success 'progress display with throughput' '
@@ -201,7 +201,7 @@ test_expect_success 'progress display with throughput' '
201
test-tool progress "Working hard" <in 2>stderr &&
202
203
show_cr <stderr >out &&
204
- test_i18ncmp expect out
204
+ test_cmp expect out
205
'
206
207
test_expect_success 'progress display with throughput and total' '
@@ -226,7 +226,7 @@ test_expect_success 'progress display with throughput and total' '
226
test-tool progress --total=40 "Working hard" <in 2>stderr &&
227
228
show_cr <stderr >out &&
229
- test_i18ncmp expect out
229
+ test_cmp expect out
230
'
231
232
test_expect_success 'cover up after throughput shortens' '
@@ -255,7 +255,7 @@ test_expect_success 'cover up after throughput shortens' '
255
test-tool progress "Working hard" <in 2>stderr &&
256
257
show_cr <stderr >out &&
258
- test_i18ncmp expect out
258
+ test_cmp expect out
259
'
260
261
test_expect_success 'cover up after throughput shortens a lot' '
@@ -280,7 +280,7 @@ test_expect_success 'cover up after throughput shortens a lot' '
280
test-tool progress "Working hard" <in 2>stderr &&
281
282
show_cr <stderr >out &&
283
- test_i18ncmp expect out
283
+ test_cmp expect out
284
'
285
286
test_expect_success 'progress generates traces' '
t/t1011-read-tree-sparse-checkout.sh
+1
-1
@@ -253,7 +253,7 @@ warning: The following paths were already present and thus not updated despite s
253
254
After fixing the above paths, you may want to run `git sparse-checkout reapply`.
255
EOF
256
- test_i18ncmp expected actual
256
+ test_cmp expected actual
257
'
258
259
test_expect_success 'checkout without --ignore-skip-worktree-bits' '
t/t1308-config-set.sh
+2
-2
@@ -208,14 +208,14 @@ test_expect_success 'proper error on error in default config files' '
208
echo "[" >>.git/config &&
209
echo "fatal: bad config line 34 in file .git/config" >expect &&
210
test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
211
- test_i18ncmp expect actual
211
+ test_cmp expect actual
212
'
213
214
test_expect_success 'proper error on error in custom config files' '
215
echo "[" >>syntax-error &&
216
echo "fatal: bad config line 1 in file syntax-error" >expect &&
217
test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
218
- test_i18ncmp expect actual
218
+ test_cmp expect actual
219
'
220
221
test_expect_success 'check line errors for malformed values' '
t/t1400-update-ref.sh
+3
-3
@@ -374,7 +374,7 @@ test_expect_success 'Query "main@{May 25 2005}" (before history)' '
374
echo "$C" >expect &&
375
test_cmp expect o &&
376
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
377
- test_i18ncmp expect e
377
+ test_cmp expect e
378
'
379
test_expect_success 'Query main@{2005-05-25} (before history)' '
380
test_when_finished "rm -f o e" &&
@@ -382,7 +382,7 @@ test_expect_success 'Query main@{2005-05-25} (before history)' '
382
echo "$C" >expect &&
383
test_cmp expect o &&
384
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
385
- test_i18ncmp expect e
385
+ test_cmp expect e
386
'
387
test_expect_success 'Query "main@{May 26 2005 23:31:59}" (1 second before history)' '
388
test_when_finished "rm -f o e" &&
@@ -390,7 +390,7 @@ test_expect_success 'Query "main@{May 26 2005 23:31:59}" (1 second before histor
390
echo "$C" >expect &&
391
test_cmp expect o &&
392
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
393
- test_i18ncmp expect e
393
+ test_cmp expect e
394
'
395
test_expect_success 'Query "main@{May 26 2005 23:32:00}" (exactly history start)' '
396
test_when_finished "rm -f o e" &&
t/t1404-update-ref-errors.sh
+1
-1
@@ -101,7 +101,7 @@ df_test() {
101
printf "%s\n" "delete $delname" "create $addname $D"
102
fi >commands &&
103
test_must_fail git update-ref --stdin <commands 2>output.err &&
104
- test_i18ncmp expected-err output.err &&
104
+ test_cmp expected-err output.err &&
105
printf "%s\n" "$C $delref" >expected-refs &&
106
git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
107
test_cmp expected-refs actual-refs
t/t1450-fsck.sh
+3
-3
@@ -380,7 +380,7 @@ test_expect_success 'tag with incorrect tag name & missing tagger' '
380
warning in tag $tag: badTagName: invalid '\''tag'\'' name: wrong name format
381
warning in tag $tag: missingTaggerEntry: invalid format - expected '\''tagger'\'' line
382
EOF
383
- test_i18ncmp expect out
383
+ test_cmp expect out
384
'
385
386
test_expect_success 'tag with bad tagger' '
@@ -806,7 +806,7 @@ test_expect_success 'fsck notices dangling objects' '
806
git fsck >actual &&
807
# the output order is non-deterministic, as it comes from a hash
808
sort <actual >actual.sorted &&
809
- test_i18ncmp expect actual.sorted
809
+ test_cmp expect actual.sorted
810
)
811
'
812
@@ -816,7 +816,7 @@ test_expect_success 'fsck --connectivity-only notices dangling objects' '
816
git fsck --connectivity-only >actual &&
817
# the output order is non-deterministic, as it comes from a hash
818
sort <actual >actual.sorted &&
819
- test_i18ncmp expect actual.sorted
819
+ test_cmp expect actual.sorted
820
)
821
'
822
t/t1502-rev-parse-parseopt.sh
+5
-5
@@ -95,7 +95,7 @@ test_expect_success 'test --parseopt help output' '
95
|EOF
96
END_EXPECT
97
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
98
- test_i18ncmp expect output
98
+ test_cmp expect output
99
'
100
101
test_expect_success 'test --parseopt help output no switches' '
@@ -108,7 +108,7 @@ test_expect_success 'test --parseopt help output no switches' '
108
|EOF
109
END_EXPECT
110
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
111
- test_i18ncmp expect output
111
+ test_cmp expect output
112
'
113
114
test_expect_success 'test --parseopt help output hidden switches' '
@@ -121,7 +121,7 @@ test_expect_success 'test --parseopt help output hidden switches' '
121
|EOF
122
END_EXPECT
123
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
124
- test_i18ncmp expect output
124
+ test_cmp expect output
125
'
126
127
test_expect_success 'test --parseopt help-all output hidden switches' '
@@ -136,7 +136,7 @@ test_expect_success 'test --parseopt help-all output hidden switches' '
136
|EOF
137
END_EXPECT
138
test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
139
- test_i18ncmp expect output
139
+ test_cmp expect output
140
'
141
142
test_expect_success 'test --parseopt invalid switch help output' '
@@ -176,7 +176,7 @@ test_expect_success 'test --parseopt invalid switch help output' '
176
|
177
END_EXPECT
178
test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
179
- test_i18ncmp expect output
179
+ test_cmp expect output
180
'
181
182
test_expect_success 'setup expect.1' "
t/t1506-rev-parse-diagnosis.sh
+1
-1
@@ -15,7 +15,7 @@ test_did_you_mean ()
15
fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ}
16
hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
17
EOF
18
- test_i18ncmp expected error
18
+ test_cmp expected error
19
}
20
21
HASH_file=
t/t1507-rev-parse-upstream.sh
+5
-5
@@ -172,7 +172,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
172
fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
173
EOF
174
error_message non-tracking@{u} &&
175
- test_i18ncmp expect error
175
+ test_cmp expect error
176
'
177
178
test_expect_success '@{u} error message when no upstream' '
@@ -180,7 +180,7 @@ test_expect_success '@{u} error message when no upstream' '
180
fatal: no upstream configured for branch ${SQ}main${SQ}
181
EOF
182
test_must_fail git rev-parse --verify @{u} 2>actual &&
183
- test_i18ncmp expect actual
183
+ test_cmp expect actual
184
'
185
186
test_expect_success 'branch@{u} error message with misspelt branch' '
@@ -188,7 +188,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
188
fatal: no such branch: ${SQ}no-such-branch${SQ}
189
EOF
190
error_message no-such-branch@{u} &&
191
- test_i18ncmp expect error
191
+ test_cmp expect error
192
'
193
194
test_expect_success '@{u} error message when not on a branch' '
@@ -197,7 +197,7 @@ test_expect_success '@{u} error message when not on a branch' '
197
EOF
198
git checkout HEAD^0 &&
199
test_must_fail git rev-parse --verify @{u} 2>actual &&
200
- test_i18ncmp expect actual
200
+ test_cmp expect actual
201
'
202
203
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
@@ -205,7 +205,7 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
205
fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
206
EOF
207
error_message bad-upstream@{u} &&
208
- test_i18ncmp expect error
208
+ test_cmp expect error
209
'
210
211
test_expect_success 'pull works when tracking a local branch' '
t/t1509-root-work-tree.sh
+2
-2
@@ -221,7 +221,7 @@ test_expect_success 'setup' '
221
rm -rf /.git &&
222
echo "Initialized empty Git repository in /.git/" > expected &&
223
git init > result &&
224
- test_i18ncmp expected result
224
+ test_cmp expected result
225
'
226
227
test_vars 'auto gitdir, root' ".git" "/" ""
@@ -246,7 +246,7 @@ test_expect_success 'setup' '
246
cd / &&
247
echo "Initialized empty Git repository in /" > expected &&
248
git init --bare > result &&
249
- test_i18ncmp expected result
249
+ test_cmp expected result
250
'
251
252
test_vars 'auto gitdir, root' "." "" ""
t/t1600-index.sh
+3
-3
@@ -18,7 +18,7 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
18
warning: GIT_INDEX_VERSION set, but the value is invalid.
19
Using version Z
20
EOF
21
- test_i18ncmp expect.err actual.err
21
+ test_cmp expect.err actual.err
22
)
23
'
24
@@ -32,7 +32,7 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
32
warning: GIT_INDEX_VERSION set, but the value is invalid.
33
Using version Z
34
EOF
35
- test_i18ncmp expect.err actual.err
35
+ test_cmp expect.err actual.err
36
)
37
'
38
@@ -55,7 +55,7 @@ test_expect_success 'out of bounds index.version issues warning' '
55
warning: index.version set, but the value is invalid.
56
Using version Z
57
EOF
58
- test_i18ncmp expect.err actual.err
58
+ test_cmp expect.err actual.err
59
)
60
'
61
t/t2018-checkout-branch.sh
+1
-1
@@ -150,7 +150,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
150
git checkout branch2 &&
151
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
152
test_must_fail git checkout -b @{-1} 2>actual &&
153
- test_i18ncmp expect actual
153
+ test_cmp expect actual
154
'
155
156
test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
t/t2020-checkout-detach.sh
+10
-10
@@ -163,7 +163,7 @@ test_expect_success 'tracking count is accurate after orphan check' '
163
git config branch.child.merge refs/heads/main &&
164
git checkout child^ &&
165
git checkout child >stdout &&
166
- test_i18ncmp expect stdout
166
+ test_cmp expect stdout
167
'
168
169
test_expect_success 'no advice given for explicit detached head state' '
@@ -237,15 +237,15 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
237
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
238
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
239
check_detached &&
240
- test_i18ncmp 1st_detach actual &&
240
+ test_cmp 1st_detach actual &&
241
242
GIT_PRINT_SHA1_ELLIPSIS="no" git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
243
check_detached &&
244
- test_i18ncmp 2nd_detach actual &&
244
+ test_cmp 2nd_detach actual &&
245
246
GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
247
check_detached &&
248
- test_i18ncmp 3rd_detach actual &&
248
+ test_cmp 3rd_detach actual &&
249
250
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
251
@@ -256,17 +256,17 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
256
# Make no mention of the env var at all
257
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
258
check_detached &&
259
- test_i18ncmp 1st_detach actual &&
259
+ test_cmp 1st_detach actual &&
260
261
GIT_PRINT_SHA1_ELLIPSIS='nope' &&
262
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
263
check_detached &&
264
- test_i18ncmp 2nd_detach actual &&
264
+ test_cmp 2nd_detach actual &&
265
266
GIT_PRINT_SHA1_ELLIPSIS=nein &&
267
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
268
check_detached &&
269
- test_i18ncmp 3rd_detach actual &&
269
+ test_cmp 3rd_detach actual &&
270
271
true
272
"
@@ -319,15 +319,15 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
319
320
GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
321
check_detached &&
322
- test_i18ncmp 1st_detach actual &&
322
+ test_cmp 1st_detach actual &&
323
324
GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
325
check_detached &&
326
- test_i18ncmp 2nd_detach actual &&
326
+ test_cmp 2nd_detach actual &&
327
328
GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
329
check_detached &&
330
- test_i18ncmp 3rd_detach actual &&
330
+ test_cmp 3rd_detach actual &&
331
332
true
333
"
t/t2200-add-update.sh
+1
-1
@@ -135,7 +135,7 @@ test_expect_success 'add -n -u should not add but just report' '
135
after=$(git ls-files -s check top) &&
136
137
test "$before" = "$after" &&
138
- test_i18ncmp expect actual
138
+ test_cmp expect actual
139
140
'
141
t/t2401-worktree-prune.sh
+2
-2
@@ -23,7 +23,7 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' '
23
cat >expect <<EOF &&
24
Removing worktrees/abc: not a valid directory
25
EOF
26
- test_i18ncmp expect actual &&
26
+ test_cmp expect actual &&
27
! test -f .git/worktrees/abc &&
28
! test -d .git/worktrees
29
'
@@ -35,7 +35,7 @@ test_expect_success 'prune directories without gitdir' '
35
Removing worktrees/def: gitdir file does not exist
36
EOF
37
git worktree prune --verbose >actual &&
38
- test_i18ncmp expect actual &&
38
+ test_cmp expect actual &&
39
! test -d .git/worktrees/def &&
40
! test -d .git/worktrees
41
'
t/t2402-worktree-list.sh
+1
-1
@@ -167,7 +167,7 @@ test_expect_success '"list" all worktrees --verbose with prunable' '
167
rm -rf prunable &&
168
git worktree list --verbose >out &&
169
sed -n "s/ */ /g;/\/prunable *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
170
- test_i18ncmp actual expect
170
+ test_cmp actual expect
171
'
172
173
test_expect_success 'bare repo setup' '
t/t3005-ls-files-relative.sh
+2
-2
@@ -46,7 +46,7 @@ test_expect_success 'ls-files -c' '
46
ls ../x* >expect.out &&
47
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
48
test_cmp expect.out actual.out &&
49
- test_i18ncmp expect.err actual.err
49
+ test_cmp expect.err actual.err
50
)
51
'
52
@@ -61,7 +61,7 @@ test_expect_success 'ls-files -o' '
61
ls ../y* >expect.out &&
62
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
63
test_cmp expect.out actual.out &&
64
- test_i18ncmp expect.err actual.err
64
+ test_cmp expect.err actual.err
65
)
66
'
67
t/t3200-branch.sh
+13
-13
@@ -695,7 +695,7 @@ test_expect_success 'deleting a symref' '
695
git branch -d symref >actual &&
696
test_path_is_file .git/refs/heads/target &&
697
test_path_is_missing .git/refs/heads/symref &&
698
- test_i18ncmp expect actual
698
+ test_cmp expect actual
699
'
700
701
test_expect_success 'deleting a dangling symref' '
@@ -704,7 +704,7 @@ test_expect_success 'deleting a dangling symref' '
704
echo "Deleted branch dangling-symref (was nowhere)." >expect &&
705
git branch -d dangling-symref >actual &&
706
test_path_is_missing .git/refs/heads/dangling-symref &&
707
- test_i18ncmp expect actual
707
+ test_cmp expect actual
708
'
709
710
test_expect_success 'deleting a self-referential symref' '
@@ -713,7 +713,7 @@ test_expect_success 'deleting a self-referential symref' '
713
echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
714
git branch -d self-reference >actual &&
715
test_path_is_missing .git/refs/heads/self-reference &&
716
- test_i18ncmp expect actual
716
+ test_cmp expect actual
717
'
718
719
test_expect_success 'renaming a symref is not allowed' '
@@ -808,7 +808,7 @@ test_expect_success 'test deleting branch without config' '
808
sha1=$(git rev-parse my7 | cut -c 1-7) &&
809
echo "Deleted branch my7 (was $sha1)." >expect &&
810
git branch -d my7 >actual 2>&1 &&
811
- test_i18ncmp expect actual
811
+ test_cmp expect actual
812
'
813
814
test_expect_success 'deleting currently checked out branch fails' '
@@ -843,7 +843,7 @@ test_expect_success 'branch from tag w/--track causes failure' '
843
test_expect_success '--set-upstream-to fails on multiple branches' '
844
echo "fatal: too many arguments to set new upstream" >expect &&
845
test_must_fail git branch --set-upstream-to main a b c 2>err &&
846
- test_i18ncmp expect err
846
+ test_cmp expect err
847
'
848
849
test_expect_success '--set-upstream-to fails on detached HEAD' '
@@ -851,13 +851,13 @@ test_expect_success '--set-upstream-to fails on detached HEAD' '
851
test_when_finished git checkout - &&
852
echo "fatal: could not set upstream of HEAD to main when it does not point to any branch." >expect &&
853
test_must_fail git branch --set-upstream-to main 2>err &&
854
- test_i18ncmp expect err
854
+ test_cmp expect err
855
'
856
857
test_expect_success '--set-upstream-to fails on a missing dst branch' '
858
echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect &&
859
test_must_fail git branch --set-upstream-to main does-not-exist 2>err &&
860
- test_i18ncmp expect err
860
+ test_cmp expect err
861
'
862
863
test_expect_success '--set-upstream-to fails on a missing src branch' '
@@ -868,7 +868,7 @@ test_expect_success '--set-upstream-to fails on a missing src branch' '
868
test_expect_success '--set-upstream-to fails on a non-ref' '
869
echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect &&
870
test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
871
- test_i18ncmp expect err
871
+ test_cmp expect err
872
'
873
874
test_expect_success '--set-upstream-to fails on locked config' '
@@ -899,7 +899,7 @@ test_expect_success 'use --set-upstream-to modify a particular branch' '
899
test_expect_success '--unset-upstream should fail if given a non-existent branch' '
900
echo "fatal: Branch '"'"'i-dont-exist'"'"' has no upstream information" >expect &&
901
test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
902
- test_i18ncmp expect err
902
+ test_cmp expect err
903
'
904
905
test_expect_success '--unset-upstream should fail if config is locked' '
@@ -921,13 +921,13 @@ test_expect_success 'test --unset-upstream on HEAD' '
921
# fail for a branch without upstream set
922
echo "fatal: Branch '"'"'main'"'"' has no upstream information" >expect &&
923
test_must_fail git branch --unset-upstream 2>err &&
924
- test_i18ncmp expect err
924
+ test_cmp expect err
925
'
926
927
test_expect_success '--unset-upstream should fail on multiple branches' '
928
echo "fatal: too many arguments to unset upstream" >expect &&
929
test_must_fail git branch --unset-upstream a b c 2>err &&
930
- test_i18ncmp expect err
930
+ test_cmp expect err
931
'
932
933
test_expect_success '--unset-upstream should fail on detached HEAD' '
@@ -935,7 +935,7 @@ test_expect_success '--unset-upstream should fail on detached HEAD' '
935
test_when_finished git checkout - &&
936
echo "fatal: could not unset upstream of HEAD when it does not point to any branch." >expect &&
937
test_must_fail git branch --unset-upstream 2>err &&
938
- test_i18ncmp expect err
938
+ test_cmp expect err
939
'
940
941
test_expect_success 'test --unset-upstream on a particular branch' '
@@ -957,7 +957,7 @@ test_expect_success '--set-upstream-to notices an error to set branch as own ups
957
EOF
958
test_expect_code 1 git config branch.my13.remote &&
959
test_expect_code 1 git config branch.my13.merge &&
960
- test_i18ncmp expect actual
960
+ test_cmp expect actual
961
'
962
963
# Keep this test last, as it changes the current branch
t/t3201-branch-contains.sh
+1
-1
@@ -264,7 +264,7 @@ test_expect_success 'branch --merged with --verbose' '
264
* topic $(git rev-parse --short topic ) [ahead 1] foo
265
zzz $(git rev-parse --short zzz ) second on main
266
EOF
267
- test_i18ncmp expect actual
267
+ test_cmp expect actual
268
'
269
270
test_done
t/t3203-branch-output.sh
+14
-14
@@ -160,7 +160,7 @@ test_expect_success 'git branch shows detached HEAD properly' '
160
EOF
161
git checkout HEAD^0 &&
162
git branch >actual &&
163
- test_i18ncmp expect actual
163
+ test_cmp expect actual
164
'
165
166
test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
@@ -173,7 +173,7 @@ test_expect_success 'git branch shows detached HEAD properly after checkout --de
173
EOF
174
git checkout --detach &&
175
git branch >actual &&
176
- test_i18ncmp expect actual
176
+ test_cmp expect actual
177
'
178
179
test_expect_success 'git branch shows detached HEAD properly after moving' '
@@ -185,7 +185,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving' '
185
EOF
186
git reset --hard HEAD^1 &&
187
git branch >actual &&
188
- test_i18ncmp expect actual
188
+ test_cmp expect actual
189
'
190
191
test_expect_success 'git branch shows detached HEAD properly from tag' '
@@ -198,7 +198,7 @@ EOF
198
git tag fromtag main &&
199
git checkout fromtag &&
200
git branch >actual &&
201
- test_i18ncmp expect actual
201
+ test_cmp expect actual
202
'
203
204
test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
@@ -210,7 +210,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving from t
210
EOF
211
git reset --hard HEAD^1 &&
212
git branch >actual &&
213
- test_i18ncmp expect actual
213
+ test_cmp expect actual
214
'
215
216
test_expect_success 'git branch `--sort=[-]objectsize` option' '
@@ -221,7 +221,7 @@ test_expect_success 'git branch `--sort=[-]objectsize` option' '
221
main
222
EOF
223
git branch --sort=objectsize >actual &&
224
- test_i18ncmp expect actual &&
224
+ test_cmp expect actual &&
225
226
cat >expect <<-\EOF &&
227
* (HEAD detached from fromtag)
@@ -230,7 +230,7 @@ test_expect_success 'git branch `--sort=[-]objectsize` option' '
230
branch-two
231
EOF
232
git branch --sort=-objectsize >actual &&
233
- test_i18ncmp expect actual
233
+ test_cmp expect actual
234
'
235
236
test_expect_success 'git branch `--sort=[-]type` option' '
@@ -241,7 +241,7 @@ test_expect_success 'git branch `--sort=[-]type` option' '
241
main
242
EOF
243
git branch --sort=type >actual &&
244
- test_i18ncmp expect actual &&
244
+ test_cmp expect actual &&
245
246
cat >expect <<-\EOF &&
247
* (HEAD detached from fromtag)
@@ -250,7 +250,7 @@ test_expect_success 'git branch `--sort=[-]type` option' '
250
main
251
EOF
252
git branch --sort=-type >actual &&
253
- test_i18ncmp expect actual
253
+ test_cmp expect actual
254
'
255
256
test_expect_success 'git branch `--sort=[-]version:refname` option' '
@@ -261,7 +261,7 @@ test_expect_success 'git branch `--sort=[-]version:refname` option' '
261
main
262
EOF
263
git branch --sort=version:refname >actual &&
264
- test_i18ncmp expect actual &&
264
+ test_cmp expect actual &&
265
266
cat >expect <<-\EOF &&
267
* (HEAD detached from fromtag)
@@ -270,7 +270,7 @@ test_expect_success 'git branch `--sort=[-]version:refname` option' '
270
branch-one
271
EOF
272
git branch --sort=-version:refname >actual &&
273
- test_i18ncmp expect actual
273
+ test_cmp expect actual
274
'
275
276
test_expect_success 'git branch --points-at option' '
@@ -337,7 +337,7 @@ test_expect_success 'git branch --format option' '
337
Refname is refs/heads/ref-to-remote
338
EOF
339
git branch --format="Refname is %(refname)" >actual &&
340
- test_i18ncmp expect actual
340
+ test_cmp expect actual
341
'
342
343
test_expect_success 'worktree colors correct' '
@@ -355,7 +355,7 @@ test_expect_success 'worktree colors correct' '
355
rm -r worktree_dir &&
356
git worktree prune &&
357
test_decode_color <actual.raw >actual &&
358
- test_i18ncmp expect actual
358
+ test_cmp expect actual
359
'
360
361
test_expect_success "set up color tests" '
@@ -398,7 +398,7 @@ test_expect_success 'verbose output lists worktree path' '
398
git branch -vv >actual &&
399
rm -r worktree_dir &&
400
git worktree prune &&
401
- test_i18ncmp expect actual
401
+ test_cmp expect actual
402
'
403
404
test_done
t/t3300-funny-names.sh
+1
-1
@@ -181,7 +181,7 @@ test_expect_success 'diffstat for rename quotes funny filename' '
181
git diff-index -M -p $t0 >diff &&
182
git apply --stat <diff >diffstat &&
183
sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
184
- test_i18ncmp expected current
184
+ test_cmp expected current
185
'
186
187
test_expect_success 'numstat for rename quotes funny filename' '
t/t3400-rebase.sh
+1
-1
@@ -113,7 +113,7 @@ test_expect_success 'rebase off of the previous branch using "-"' '
113
test_cmp expect.forkpoint actual.forkpoint &&
114
# the next one is dubious---we may want to say "-",
115
# instead of @{-1}, in the message
116
- test_i18ncmp expect.messages actual.messages
116
+ test_cmp expect.messages actual.messages
117
'
118
119
test_expect_success 'rebase a single mode change' '
t/t3404-rebase-interactive.sh
+12
-12
@@ -86,7 +86,7 @@ test_expect_success 'rebase -i with empty todo list' '
86
git rebase -i HEAD^ >output 2>&1
87
) &&
88
tail -n 1 output >actual && # Ignore output about changing todo list
89
- test_i18ncmp expect actual
89
+ test_cmp expect actual
90
'
91
92
test_expect_success 'rebase -i with the exec command' '
@@ -158,9 +158,9 @@ test_expect_success 'rebase -x with empty command fails' '
158
test_when_finished "git rebase --abort ||:" &&
159
test_must_fail env git rebase -x "" @ 2>actual &&
160
test_write_lines "error: empty exec command" >expected &&
161
- test_i18ncmp expected actual &&
161
+ test_cmp expected actual &&
162
test_must_fail env git rebase -x " " @ 2>actual &&
163
- test_i18ncmp expected actual
163
+ test_cmp expected actual
164
'
165
166
test_expect_success 'rebase -x with newline in command fails' '
@@ -168,7 +168,7 @@ test_expect_success 'rebase -x with newline in command fails' '
168
test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
169
test_write_lines "error: exec commands cannot contain newlines" \
170
>expected &&
171
- test_i18ncmp expected actual
171
+ test_cmp expected actual
172
'
173
174
test_expect_success 'rebase -i with exec of inexistent command' '
@@ -1465,7 +1465,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
1465
FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
1466
) &&
1467
head -n4 actual.2 >actual &&
1468
- test_i18ncmp expect actual &&
1468
+ test_cmp expect actual &&
1469
test D = $(git cat-file commit HEAD | sed -ne \$p)
1470
'
1471
@@ -1489,7 +1489,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
1489
set_fake_editor &&
1490
test_must_fail env FAKE_LINES="1 2 4" \
1491
git rebase -i --root 2>actual &&
1492
- test_i18ncmp expect actual &&
1492
+ test_cmp expect actual &&
1493
cp .git/rebase-merge/git-rebase-todo.backup \
1494
.git/rebase-merge/git-rebase-todo &&
1495
FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
@@ -1535,11 +1535,11 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
1535
cp .git/rebase-merge/git-rebase-todo.backup orig &&
1536
FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
1537
head -n6 actual.2 >actual &&
1538
- test_i18ncmp expect actual &&
1538
+ test_cmp expect actual &&
1539
cp orig .git/rebase-merge/git-rebase-todo &&
1540
FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
1541
head -n4 actual.2 >actual &&
1542
- test_i18ncmp expect.3 actual &&
1542
+ test_cmp expect.3 actual &&
1543
git rebase --continue 2>actual
1544
) &&
1545
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1575,16 +1575,16 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = er
1575
cp .git/rebase-merge/git-rebase-todo.backup orig &&
1576
test_must_fail env FAKE_LINES="2 3 4" \
1577
git rebase --edit-todo 2>actual &&
1578
- test_i18ncmp expect actual &&
1578
+ test_cmp expect actual &&
1579
test_must_fail git rebase --continue 2>actual &&
1580
- test_i18ncmp expect.2 actual &&
1580
+ test_cmp expect.2 actual &&
1581
test_must_fail git rebase --edit-todo &&
1582
cp orig .git/rebase-merge/git-rebase-todo &&
1583
test_must_fail env FAKE_LINES="1 2 3 4" \
1584
git rebase --edit-todo 2>actual &&
1585
- test_i18ncmp expect.3 actual &&
1585
+ test_cmp expect.3 actual &&
1586
test_must_fail git rebase --continue 2>actual &&
1587
- test_i18ncmp expect.3 actual &&
1587
+ test_cmp expect.3 actual &&
1588
cp orig .git/rebase-merge/git-rebase-todo &&
1589
FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
1590
git rebase --continue 2>actual
t/t3420-rebase-autostash.sh
+2
-2
@@ -110,7 +110,7 @@ testrebase () {
110
fi &&
111
create_expected_success_$suffix &&
112
sed "$remove_progress_re" <actual >actual2 &&
113
- test_i18ncmp expected actual2
113
+ test_cmp expected actual2
114
'
115
116
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -231,7 +231,7 @@ testrebase () {
231
fi &&
232
create_expected_failure_$suffix &&
233
sed "$remove_progress_re" <actual >actual2 &&
234
- test_i18ncmp expected actual2
234
+ test_cmp expected actual2
235
'
236
}
237
t/t3504-cherry-pick-rerere.sh
+2
-2
@@ -74,10 +74,10 @@ test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' '
74
git diff-files --quiet &&
75
test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
76
echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
77
- test_i18ncmp expect actual &&
77
+ test_cmp expect actual &&
78
test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
79
echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
80
- test_i18ncmp expect actual &&
80
+ test_cmp expect actual &&
81
git cherry-pick --abort
82
'
83
t/t3507-cherry-pick-conflict.sh
+6
-6
@@ -59,7 +59,7 @@ test_expect_success 'advice from failed cherry-pick' "
59
EOF
60
test_must_fail git cherry-pick picked 2>actual &&
61
62
- test_i18ncmp expected actual
62
+ test_cmp expected actual
63
"
64
65
test_expect_success 'advice from failed cherry-pick --no-commit' "
@@ -73,7 +73,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
73
EOF
74
test_must_fail git cherry-pick --no-commit picked 2>actual &&
75
76
- test_i18ncmp expected actual
76
+ test_cmp expected actual
77
"
78
79
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
@@ -256,7 +256,7 @@ test_expect_success \
256
257
test_must_fail git cherry-pick picked &&
258
259
- test_i18ncmp expected .git/MERGE_MSG
259
+ test_cmp expected .git/MERGE_MSG
260
'
261
262
test_expect_success \
@@ -276,7 +276,7 @@ test_expect_success \
276
277
test_must_fail git cherry-pick --cleanup=scissors picked &&
278
279
- test_i18ncmp expected .git/MERGE_MSG
279
+ test_cmp expected .git/MERGE_MSG
280
'
281
282
test_expect_success 'failed cherry-pick describes conflict in work tree' '
@@ -465,7 +465,7 @@ test_expect_success \
465
test_must_fail git revert picked &&
466
467
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
468
- test_i18ncmp expected actual
468
+ test_cmp expected actual
469
'
470
471
test_expect_success \
@@ -488,7 +488,7 @@ test_expect_success \
488
test_must_fail git revert --cleanup=scissors picked &&
489
490
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
491
- test_i18ncmp expected actual
491
+ test_cmp expected actual
492
'
493
494
test_expect_success 'failed cherry-pick does not forget -s' '
t/t3508-cherry-pick-many-commits.sh
+2
-2
@@ -86,7 +86,7 @@ test_expect_success 'output to keep user entertained during multi-pick' '
86
git cherry-pick first..fourth >actual &&
87
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
88
test_line_count -ge 3 actual.fuzzy &&
89
- test_i18ncmp expected actual.fuzzy
89
+ test_cmp expected actual.fuzzy
90
'
91
92
test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
@@ -123,7 +123,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' '
123
test_tick &&
124
git cherry-pick --strategy resolve first..fourth >actual &&
125
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
126
- test_i18ncmp expected actual.fuzzy
126
+ test_cmp expected actual.fuzzy
127
'
128
129
test_expect_success 'cherry-pick --ff first..fourth works' '
t/t3510-cherry-pick-sequence.sh
+4
-4
@@ -170,7 +170,7 @@ test_expect_success 'check advice when we move HEAD by committing' '
170
git commit -a &&
171
test_path_is_missing .git/CHERRY_PICK_HEAD &&
172
test_must_fail git cherry-pick --skip 2>advice &&
173
- test_i18ncmp expect advice
173
+ test_cmp expect advice
174
'
175
176
test_expect_success 'selectively advise --skip while launching another sequence' '
@@ -182,7 +182,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
182
EOF
183
test_must_fail git cherry-pick picked..yetanotherpick &&
184
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
185
- test_i18ncmp expect advice &&
185
+ test_cmp expect advice &&
186
cat >expect <<-EOF &&
187
error: cherry-pick is already in progress
188
hint: try "git cherry-pick (--continue | --abort | --quit)"
@@ -190,7 +190,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
190
EOF
191
git reset --merge &&
192
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
193
- test_i18ncmp expect advice
193
+ test_cmp expect advice
194
'
195
196
test_expect_success 'allow skipping commit but not abort for a new history' '
@@ -204,7 +204,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' '
204
test_must_fail git cherry-pick anotherpick &&
205
test_must_fail git cherry-pick --abort 2>advice &&
206
git cherry-pick --skip &&
207
- test_i18ncmp expect advice
207
+ test_cmp expect advice
208
'
209
210
test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
t/t3600-rm.sh
+8
-8
@@ -442,7 +442,7 @@ test_expect_success 'rm issues a warning when section is not found in .gitmodule
442
git add .gitmodules &&
443
echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
444
git rm submod >actual 2>actual.err &&
445
- test_i18ncmp expect.err actual.err &&
445
+ test_cmp expect.err actual.err &&
446
test_path_is_missing submod &&
447
test_path_is_missing submod/.git &&
448
git status -s -uno >actual &&
@@ -812,7 +812,7 @@ test_expect_success 'rm files with different staged content' '
812
echo content1 >foo.txt &&
813
echo content1 >bar.txt &&
814
test_must_fail git rm foo.txt bar.txt 2>actual &&
815
- test_i18ncmp expect actual
815
+ test_cmp expect actual
816
'
817
818
test_expect_success 'rm files with different staged content without hints' '
@@ -825,7 +825,7 @@ test_expect_success 'rm files with different staged content without hints' '
825
echo content2 >foo.txt &&
826
echo content2 >bar.txt &&
827
test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
828
- test_i18ncmp expect actual
828
+ test_cmp expect actual
829
'
830
831
test_expect_success 'rm file with local modification' '
@@ -837,7 +837,7 @@ test_expect_success 'rm file with local modification' '
837
git commit -m "testing rm 3" &&
838
echo content3 >foo.txt &&
839
test_must_fail git rm foo.txt 2>actual &&
840
- test_i18ncmp expect actual
840
+ test_cmp expect actual
841
'
842
843
test_expect_success 'rm file with local modification without hints' '
@@ -847,7 +847,7 @@ test_expect_success 'rm file with local modification without hints' '
847
EOF
848
echo content4 >bar.txt &&
849
test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
850
- test_i18ncmp expect actual
850
+ test_cmp expect actual
851
'
852
853
test_expect_success 'rm file with changes in the index' '
@@ -860,7 +860,7 @@ test_expect_success 'rm file with changes in the index' '
860
echo content5 >foo.txt &&
861
git add foo.txt &&
862
test_must_fail git rm foo.txt 2>actual &&
863
- test_i18ncmp expect actual
863
+ test_cmp expect actual
864
'
865
866
test_expect_success 'rm file with changes in the index without hints' '
@@ -869,7 +869,7 @@ test_expect_success 'rm file with changes in the index without hints' '
869
foo.txt
870
EOF
871
test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
872
- test_i18ncmp expect actual
872
+ test_cmp expect actual
873
'
874
875
test_expect_success 'rm files with two different errors' '
@@ -888,7 +888,7 @@ test_expect_success 'rm files with two different errors' '
888
echo content6 >bar1.txt &&
889
git add bar1.txt &&
890
test_must_fail git rm bar1.txt foo1.txt 2>actual &&
891
- test_i18ncmp expect actual
891
+ test_cmp expect actual
892
'
893
894
test_expect_success 'rm empty string should fail' '
t/t3700-add.sh
+4
-4
@@ -304,7 +304,7 @@ test_expect_success 'error on a repository with no commits' '
304
error: '"'empty/'"' does not have a commit checked out
305
fatal: adding files failed
306
EOF
307
- test_i18ncmp expect actual
307
+ test_cmp expect actual
308
'
309
310
test_expect_success 'git add --dry-run of existing changed file' "
@@ -320,7 +320,7 @@ test_expect_success 'git add --dry-run of non-existing file' "
320
321
test_expect_success 'git add --dry-run of an existing file output' "
322
echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
323
- test_i18ncmp expect actual
323
+ test_cmp expect actual
324
"
325
326
cat >expect.err <<\EOF
@@ -339,8 +339,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
339
'
340
341
test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
342
- test_i18ncmp expect.out actual.out &&
343
- test_i18ncmp expect.err actual.err
342
+ test_cmp expect.out actual.out &&
343
+ test_cmp expect.err actual.err
344
'
345
346
test_expect_success 'git add empty string should fail' '
t/t3701-add-interactive.sh
+1
-1
@@ -974,7 +974,7 @@ test_expect_success 'show help from add--helper' '
974
EOF
975
test_write_lines h | force_color git add -i >actual.colored &&
976
test_decode_color <actual.colored >actual &&
977
- test_i18ncmp expect actual
977
+ test_cmp expect actual
978
'
979
980
test_done
t/t3903-stash.sh
+4
-4
@@ -564,7 +564,7 @@ test_expect_success 'stash show format defaults to --stat' '
564
1 file changed, 1 insertion(+)
565
EOF
566
git stash show ${STASH_ID} >actual &&
567
- test_i18ncmp expected actual
567
+ test_cmp expected actual
568
'
569
570
test_expect_success 'stash show - stashes on stack, stash-like argument' '
@@ -792,7 +792,7 @@ test_expect_success 'apply: show same status as git status (relative to ./)' '
792
git stash apply
793
) |
794
sed -e 1d >actual && # drop "Saved..."
795
- test_i18ncmp expect actual
795
+ test_cmp expect actual
796
'
797
798
cat >expect <<EOF
@@ -1114,7 +1114,7 @@ test_expect_success 'stash push -p with pathspec shows no changes only once' '
1114
git stash push -p foo >actual &&
1115
echo "No local changes to save" >expect &&
1116
git reset --hard HEAD~ &&
1117
- test_i18ncmp expect actual
1117
+ test_cmp expect actual
1118
'
1119
1120
test_expect_success 'push <pathspec>: show no changes when there are none' '
@@ -1124,7 +1124,7 @@ test_expect_success 'push <pathspec>: show no changes when there are none' '
1124
git stash push foo >actual &&
1125
echo "No local changes to save" >expect &&
1126
git reset --hard HEAD~ &&
1127
- test_i18ncmp expect actual
1127
+ test_cmp expect actual
1128
'
1129
1130
test_expect_success 'push: <pathspec> not in the repository errors out' '
t/t3905-stash-include-untracked.sh
+1
-1
@@ -280,7 +280,7 @@ test_expect_success 'stash -u -- <ignored> leaves ignored file alone' '
280
test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' '
281
git stash push -u -- non-existent >actual &&
282
echo "No local changes to save" >expect &&
283
- test_i18ncmp expect actual
283
+ test_cmp expect actual
284
'
285
286
test_expect_success 'stash -u with globs' '
t/t4006-diff-mode.sh
+4
-4
@@ -39,13 +39,13 @@ test_expect_success '--stat output after text chmod' '
39
1 file changed, 0 insertions(+), 0 deletions(-)
40
EOF
41
git diff HEAD --stat >actual &&
42
- test_i18ncmp expect actual
42
+ test_cmp expect actual
43
'
44
45
test_expect_success '--shortstat output after text chmod' '
46
tail -n 1 <expect >expect.short &&
47
git diff HEAD --shortstat >actual &&
48
- test_i18ncmp expect.short actual
48
+ test_cmp expect.short actual
49
'
50
51
test_expect_success '--stat output after binary chmod' '
@@ -56,13 +56,13 @@ test_expect_success '--stat output after binary chmod' '
56
2 files changed, 0 insertions(+), 0 deletions(-)
57
EOF
58
git diff HEAD --stat >actual &&
59
- test_i18ncmp expect actual
59
+ test_cmp expect actual
60
'
61
62
test_expect_success '--shortstat output after binary chmod' '
63
tail -n 1 <expect >expect.short &&
64
git diff HEAD --shortstat >actual &&
65
- test_i18ncmp expect.short actual
65
+ test_cmp expect.short actual
66
'
67
68
test_done
t/t4012-diff-binary.sh
+3
-3
@@ -34,19 +34,19 @@ EOF
34
test_expect_success 'apply --stat output for binary file change' '
35
git diff >diff &&
36
git apply --stat --summary <diff >current &&
37
- test_i18ncmp expected current
37
+ test_cmp expected current
38
'
39
40
test_expect_success 'diff --shortstat output for binary file change' '
41
tail -n 1 expected >expect &&
42
git diff --shortstat >current &&
43
- test_i18ncmp expect current
43
+ test_cmp expect current
44
'
45
46
test_expect_success 'diff --shortstat output for binary file change only' '
47
echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
48
git diff --shortstat -- b >current &&
49
- test_i18ncmp expected current
49
+ test_cmp expected current
50
'
51
52
test_expect_success 'apply --numstat notices binary file change' '
t/t4013-diff-various.sh
+1
-1
@@ -222,7 +222,7 @@ do
222
process_diffs "$expect" >expect &&
223
case $cmd in
224
*format-patch* | *-stat*)
225
- test_i18ncmp expect actual;;
225
+ test_cmp expect actual;;
226
*)
227
test_cmp expect actual;;
228
esac &&
t/t4014-format-patch.sh
+3
-3
@@ -888,11 +888,11 @@ echo "fatal: --check does not make sense" >expect.check
888
889
test_expect_success 'options no longer allowed for format-patch' '
890
test_must_fail git format-patch --name-only 2>output &&
891
- test_i18ncmp expect.name-only output &&
891
+ test_cmp expect.name-only output &&
892
test_must_fail git format-patch --name-status 2>output &&
893
- test_i18ncmp expect.name-status output &&
893
+ test_cmp expect.name-status output &&
894
test_must_fail git format-patch --check 2>output &&
895
- test_i18ncmp expect.check output
895
+ test_cmp expect.check output
896
'
897
898
test_expect_success 'format-patch --numstat should produce a patch' '
t/t4016-diff-quote.sh
+1
-1
@@ -82,7 +82,7 @@ test_expect_success 'git diff --stat -M HEAD' '
82
7 files changed, 0 insertions(+), 0 deletions(-)
83
EOF
84
git diff --stat -M HEAD >actual &&
85
- test_i18ncmp expect actual
85
+ test_cmp expect actual
86
'
87
88
test_done
t/t4030-diff-textconv.sh
+1
-1
@@ -139,7 +139,7 @@ EOF
139
test_expect_success 'diffstat does not run textconv' '
140
echo file diff=fail >.gitattributes &&
141
git diff --stat HEAD^ HEAD >actual &&
142
- test_i18ncmp expect.stat actual &&
142
+ test_cmp expect.stat actual &&
143
144
head -n1 <expect.stat >expect.line1 &&
145
head -n1 <actual >actual.line1 &&
t/t4045-diff-relative.sh
+1
-1
@@ -61,7 +61,7 @@ check_stat () {
61
EOF
62
test_expect_success "--stat $*" "
63
git -C '$dir' diff --stat $* HEAD^ >actual &&
64
- test_i18ncmp expected actual
64
+ test_cmp expected actual
65
"
66
}
67
t/t4049-diff-stat-count.sh
+3
-3
@@ -25,7 +25,7 @@ test_expect_success 'mode-only change show as a 0-line change' '
25
4 files changed, 2 insertions(+)
26
EOF
27
git diff --stat --stat-count=2 HEAD >actual &&
28
- test_i18ncmp expect actual
28
+ test_cmp expect actual
29
'
30
31
test_expect_success 'binary changes do not count in lines' '
@@ -40,7 +40,7 @@ test_expect_success 'binary changes do not count in lines' '
40
3 files changed, 2 insertions(+)
41
EOF
42
git diff --stat --stat-count=2 >actual &&
43
- test_i18ncmp expect actual
43
+ test_cmp expect actual
44
'
45
46
test_expect_success 'exclude unmerged entries from total file count' '
@@ -62,7 +62,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
62
3 files changed, 3 insertions(+)
63
EOF
64
git diff --stat --stat-count=2 >actual &&
65
- test_i18ncmp expect actual
65
+ test_cmp expect actual
66
'
67
68
test_done
t/t4100-apply-stat.sh
+2
-2
@@ -17,13 +17,13 @@ do
17
test_expect_success "$title" '
18
git apply --stat --summary \
19
<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
20
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
20
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
21
'
22
23
test_expect_success "$title with recount" '
24
sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
25
git apply --recount --stat --summary >current &&
26
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
26
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
27
'
28
done <<\EOF
29
rename
t/t4150-am.sh
+1
-1
@@ -906,7 +906,7 @@ test_expect_success 'am empty-file does not infloop' '
906
test_tick &&
907
test_must_fail git am empty-file 2>actual &&
908
echo Patch format detection failed. >expected &&
909
- test_i18ncmp expected actual
909
+ test_cmp expected actual
910
'
911
912
test_expect_success 'am --message-id really adds the message id' '
t/t4153-am-resume-override-opts.sh
+1
-1
@@ -61,7 +61,7 @@ test_expect_success '--no-quiet overrides --quiet' '
61
# Applying side2 will be quiet.
62
git am --no-quiet --continue >out &&
63
echo "Applying: side1" >expected &&
64
- test_i18ncmp expected out
64
+ test_cmp expected out
65
'
66
67
test_expect_success '--signoff overrides --no-signoff' '
t/t4205-log-pretty-formats.sh
+1
-1
@@ -123,7 +123,7 @@ test_expect_success 'NUL separation with --stat' '
123
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
124
printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
125
git log -z --stat --pretty="format:%s" >actual &&
126
- test_i18ncmp expected actual
126
+ test_cmp expected actual
127
'
128
129
test_expect_failure 'NUL termination with --stat' '
t/t4254-am-corrupt.sh
+1
-1
@@ -60,7 +60,7 @@ test_expect_success 'try to apply corrupted patch' '
60
test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual &&
61
echo "error: git diff header lacks filename information (line 4)" >expected &&
62
test_path_is_file f &&
63
- test_i18ncmp expected actual
63
+ test_cmp expected actual
64
'
65
66
test_expect_success "NUL in commit message's body" '
t/t5150-request-pull.sh
+2
-2
@@ -223,14 +223,14 @@ test_expect_success 'pull request format' '
223
git request-pull initial "$downstream_url" tags/full >../request
224
) &&
225
<request sed -nf fuzz.sed >request.fuzzy &&
226
- test_i18ncmp expect request.fuzzy &&
226
+ test_cmp expect request.fuzzy &&
227
228
(
229
cd local &&
230
git request-pull initial "$downstream_url" tags/full:refs/tags/full
231
) >request &&
232
sed -nf fuzz.sed <request >request.fuzzy &&
233
- test_i18ncmp expect request.fuzzy &&
233
+ test_cmp expect request.fuzzy &&
234
235
(
236
cd local &&
t/t5316-pack-delta-depth.sh
+2
-2
@@ -84,14 +84,14 @@ test_expect_success 'packing produces a long delta' '
84
pack=$(git pack-objects --all --window=0 </dev/null pack) &&
85
echo 9 >expect &&
86
max_chain pack-$pack.pack >actual &&
87
- test_i18ncmp expect actual
87
+ test_cmp expect actual
88
'
89
90
test_expect_success '--depth limits depth' '
91
pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
92
echo 5 >expect &&
93
max_chain pack-$pack.pack >actual &&
94
- test_i18ncmp expect actual
94
+ test_cmp expect actual
95
'
96
97
test_done
t/t5500-fetch-pack.sh
+3
-3
@@ -547,7 +547,7 @@ test_expect_success 'test lonely missing ref' '
547
cd client &&
548
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
549
) &&
550
- test_i18ncmp expect-error error-m
550
+ test_cmp expect-error error-m
551
'
552
553
test_expect_success 'test missing ref after existing' '
@@ -555,7 +555,7 @@ test_expect_success 'test missing ref after existing' '
555
cd client &&
556
test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
557
) &&
558
- test_i18ncmp expect-error error-em
558
+ test_cmp expect-error error-em
559
'
560
561
test_expect_success 'test missing ref before existing' '
@@ -563,7 +563,7 @@ test_expect_success 'test missing ref before existing' '
563
cd client &&
564
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
565
) &&
566
- test_i18ncmp expect-error error-me
566
+ test_cmp expect-error error-me
567
'
568
569
test_expect_success 'test --all, --depth, and explicit head' '
t/t5505-remote.sh
+12
-12
@@ -140,8 +140,8 @@ test_expect_success 'remove remote protects local branches' '
140
git remote rm oops 2>actual2 &&
141
git branch -d foobranch &&
142
git tag -d footag &&
143
- test_i18ncmp expect1 actual1 &&
144
- test_i18ncmp expect2 actual2
143
+ test_cmp expect1 actual1 &&
144
+ test_cmp expect2 actual2
145
)
146
'
147
@@ -150,7 +150,7 @@ test_expect_success 'remove errors out early when deleting non-existent branch'
150
cd test &&
151
echo "error: No such remote: '\''foo'\''" >expect &&
152
test_expect_code 2 git remote rm foo 2>actual &&
153
- test_i18ncmp expect actual
153
+ test_cmp expect actual
154
)
155
'
156
@@ -178,7 +178,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
178
cd test &&
179
echo "error: No such remote: '\''foo'\''" >expect &&
180
test_expect_code 2 git remote rename foo bar 2>actual &&
181
- test_i18ncmp expect actual
181
+ test_cmp expect actual
182
)
183
'
184
@@ -186,14 +186,14 @@ test_expect_success 'rename errors out early when when new name is invalid' '
186
test_config remote.foo.vcs bar &&
187
echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
188
test_must_fail git remote rename foo invalid...name 2>actual &&
189
- test_i18ncmp expect actual
189
+ test_cmp expect actual
190
'
191
192
test_expect_success 'add existing foreign_vcs remote' '
193
test_config remote.foo.vcs bar &&
194
echo "error: remote foo already exists." >expect &&
195
test_expect_code 3 git remote add foo bar 2>actual &&
196
- test_i18ncmp expect actual
196
+ test_cmp expect actual
197
'
198
199
test_expect_success 'add existing foreign_vcs remote' '
@@ -201,13 +201,13 @@ test_expect_success 'add existing foreign_vcs remote' '
201
test_config remote.bar.vcs bar &&
202
echo "error: remote bar already exists." >expect &&
203
test_expect_code 3 git remote rename foo bar 2>actual &&
204
- test_i18ncmp expect actual
204
+ test_cmp expect actual
205
'
206
207
test_expect_success 'add invalid foreign_vcs remote' '
208
echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
209
test_must_fail git remote add invalid...name bar 2>actual &&
210
- test_i18ncmp expect actual
210
+ test_cmp expect actual
211
'
212
213
cat >test/expect <<EOF
@@ -267,7 +267,7 @@ test_expect_success 'show' '
267
git config --add remote.two.push refs/heads/main:refs/heads/another &&
268
git remote show origin two >output &&
269
git branch -d rebase octopus &&
270
- test_i18ncmp expect output
270
+ test_cmp expect output
271
)
272
'
273
@@ -294,7 +294,7 @@ test_expect_success 'show -n' '
294
cd test &&
295
git remote show -n origin >output &&
296
mv ../one.unreachable ../one &&
297
- test_i18ncmp expect output
297
+ test_cmp expect output
298
)
299
'
300
@@ -337,7 +337,7 @@ test_expect_success 'set-head --auto has no problem w/multiple HEADs' '
337
git fetch two "refs/heads/*:refs/remotes/two/*" &&
338
git remote set-head --auto two >output 2>&1 &&
339
echo "two/HEAD set to main" >expect &&
340
- test_i18ncmp expect output
340
+ test_cmp expect output
341
)
342
'
343
@@ -369,7 +369,7 @@ test_expect_success 'prune --dry-run' '
369
git remote prune --dry-run origin >output &&
370
git rev-parse refs/remotes/origin/side2 &&
371
test_must_fail git rev-parse refs/remotes/origin/side &&
372
- test_i18ncmp expect output
372
+ test_cmp expect output
373
)
374
'
375
t/t5510-fetch.sh
+1
-1
@@ -1051,7 +1051,7 @@ test_expect_success 'fetch --prune prints the remotes url' '
1051
git fetch --prune origin 2>&1 | head -n1 >../actual
1052
) &&
1053
echo "From ${D}/." >expect &&
1054
- test_i18ncmp expect actual
1054
+ test_cmp expect actual
1055
'
1056
1057
test_expect_success 'branchname D/F conflict resolved by --prune' '
t/t5512-ls-remote.sh
+1
-1
@@ -150,7 +150,7 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
150
# We could just as easily have used "main"; the "*" emphasizes its
151
# role as a pattern.
152
test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
153
- test_i18ncmp exp actual
153
+ test_cmp exp actual
154
'
155
156
test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
t/t5526-fetch-submodules.sh
+19
-19
@@ -74,7 +74,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
74
git fetch --recurse-submodules >../actual.out 2>../actual.err
75
) &&
76
test_must_be_empty actual.out &&
77
- test_i18ncmp expect.err actual.err
77
+ test_cmp expect.err actual.err
78
'
79
80
test_expect_success "submodule.recurse option triggers recursive fetch" '
@@ -84,7 +84,7 @@ test_expect_success "submodule.recurse option triggers recursive fetch" '
84
git -c submodule.recurse fetch >../actual.out 2>../actual.err
85
) &&
86
test_must_be_empty actual.out &&
87
- test_i18ncmp expect.err actual.err
87
+ test_cmp expect.err actual.err
88
'
89
90
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
@@ -94,7 +94,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou
94
GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
95
) &&
96
test_must_be_empty actual.out &&
97
- test_i18ncmp expect.err actual.err &&
97
+ test_cmp expect.err actual.err &&
98
grep "2 tasks" trace.out
99
'
100
@@ -124,7 +124,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i
124
git fetch >../actual.out 2>../actual.err
125
) &&
126
test_must_be_empty actual.out &&
127
- test_i18ncmp expect.err actual.err
127
+ test_cmp expect.err actual.err
128
'
129
130
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
@@ -155,7 +155,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
155
git config --unset submodule.submodule.fetchRecurseSubmodules
156
) &&
157
test_must_be_empty actual.out &&
158
- test_i18ncmp expect.err actual.err
158
+ test_cmp expect.err actual.err
159
'
160
161
test_expect_success "--quiet propagates to submodules" '
@@ -183,7 +183,7 @@ test_expect_success "--dry-run propagates to submodules" '
183
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
184
) &&
185
test_must_be_empty actual.out &&
186
- test_i18ncmp expect.err actual.err
186
+ test_cmp expect.err actual.err
187
'
188
189
test_expect_success "Without --dry-run propagates to submodules" '
@@ -192,7 +192,7 @@ test_expect_success "Without --dry-run propagates to submodules" '
192
git fetch --recurse-submodules >../actual.out 2>../actual.err
193
) &&
194
test_must_be_empty actual.out &&
195
- test_i18ncmp expect.err actual.err
195
+ test_cmp expect.err actual.err
196
'
197
198
test_expect_success "recurseSubmodules=true propagates into submodules" '
@@ -203,7 +203,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
203
git fetch >../actual.out 2>../actual.err
204
) &&
205
test_must_be_empty actual.out &&
206
- test_i18ncmp expect.err actual.err
206
+ test_cmp expect.err actual.err
207
'
208
209
test_expect_success "--recurse-submodules overrides config in submodule" '
@@ -217,7 +217,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" '
217
git fetch --recurse-submodules >../actual.out 2>../actual.err
218
) &&
219
test_must_be_empty actual.out &&
220
- test_i18ncmp expect.err actual.err
220
+ test_cmp expect.err actual.err
221
'
222
223
test_expect_success "--no-recurse-submodules overrides config setting" '
@@ -257,7 +257,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
257
cd downstream &&
258
git fetch >../actual.out 2>../actual.err
259
) &&
260
- test_i18ncmp expect.err.sub actual.err &&
260
+ test_cmp expect.err.sub actual.err &&
261
test_must_be_empty actual.out
262
'
263
@@ -275,7 +275,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
275
git fetch >../actual.out 2>../actual.err
276
) &&
277
test_must_be_empty actual.out &&
278
- test_i18ncmp expect.err.file actual.err
278
+ test_cmp expect.err.file actual.err
279
'
280
281
test_expect_success "Recursion picks up config in submodule" '
@@ -303,7 +303,7 @@ test_expect_success "Recursion picks up config in submodule" '
303
git config --unset fetch.recurseSubmodules
304
)
305
) &&
306
- test_i18ncmp expect.err.sub actual.err &&
306
+ test_cmp expect.err.sub actual.err &&
307
test_must_be_empty actual.out
308
'
309
@@ -336,7 +336,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
336
cd downstream &&
337
git fetch >../actual.out 2>../actual.err
338
) &&
339
- test_i18ncmp expect.err.2 actual.err &&
339
+ test_cmp expect.err.2 actual.err &&
340
test_must_be_empty actual.out
341
'
342
@@ -392,7 +392,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
392
)
393
) &&
394
test_must_be_empty actual.out &&
395
- test_i18ncmp expect.err actual.err
395
+ test_cmp expect.err actual.err
396
'
397
398
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
@@ -409,7 +409,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
409
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
410
) &&
411
test_must_be_empty actual.out &&
412
- test_i18ncmp expect.err.file actual.err
412
+ test_cmp expect.err.file actual.err
413
'
414
415
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
@@ -437,7 +437,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
437
git config --unset fetch.recurseSubmodules
438
) &&
439
test_must_be_empty actual.out &&
440
- test_i18ncmp expect.err.2 actual.err
440
+ test_cmp expect.err.2 actual.err
441
'
442
443
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
@@ -465,7 +465,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
465
git config --unset submodule.submodule.fetchRecurseSubmodules
466
) &&
467
test_must_be_empty actual.out &&
468
- test_i18ncmp expect.err.2 actual.err
468
+ test_cmp expect.err.2 actual.err
469
'
470
471
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
@@ -484,7 +484,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
484
git fetch >../actual.out 2>../actual.err
485
) &&
486
test_must_be_empty actual.out &&
487
- test_i18ncmp expect.err actual.err &&
487
+ test_cmp expect.err actual.err &&
488
(
489
cd submodule &&
490
git checkout -q sub
@@ -520,7 +520,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git
520
git reset --hard
521
) &&
522
test_must_be_empty actual.out &&
523
- test_i18ncmp expect.err.2 actual.err &&
523
+ test_cmp expect.err.2 actual.err &&
524
git checkout HEAD^ -- .gitmodules &&
525
git add .gitmodules &&
526
git commit -m "new submodule restored .gitmodules"
t/t5541-http-push-smart.sh
+1
-1
@@ -118,7 +118,7 @@ test_expect_success 'rejected update prints status' '
118
git commit -m dev2 &&
119
test_must_fail git push origin dev2 2>act &&
120
sed -e "/^remote: /s/ *$//" <act >cmp &&
121
- test_i18ncmp exp cmp
121
+ test_cmp exp cmp
122
'
123
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
124
t/t6020-bundle-misc.sh
+14
-14
@@ -175,7 +175,7 @@ test_expect_success 'create bundle from special rev: main^!' '
175
cat >expect <<-\EOF &&
176
<COMMIT-P> refs/heads/main
177
EOF
178
- test_i18ncmp expect actual &&
178
+ test_cmp expect actual &&
179
180
git bundle verify special-rev.bdl |
181
make_user_friendly_and_stable_output >actual &&
@@ -185,7 +185,7 @@ test_expect_success 'create bundle from special rev: main^!' '
185
The bundle requires this ref:
186
<COMMIT-O>
187
EOF
188
- test_i18ncmp expect actual &&
188
+ test_cmp expect actual &&
189
190
test_bundle_object_count special-rev.bdl 3
191
'
@@ -207,7 +207,7 @@ test_expect_success 'create bundle with --max-count option' '
207
The bundle requires this ref:
208
<COMMIT-O>
209
EOF
210
- test_i18ncmp expect actual &&
210
+ test_cmp expect actual &&
211
212
test_bundle_object_count max-count.bdl 4
213
'
@@ -236,7 +236,7 @@ test_expect_success 'create bundle with --since option' '
236
<COMMIT-M>
237
<COMMIT-K>
238
EOF
239
- test_i18ncmp expect actual &&
239
+ test_cmp expect actual &&
240
241
test_bundle_object_count --thin since.bdl 13
242
'
@@ -262,11 +262,11 @@ test_expect_success 'create bundle 1 - no prerequisites' '
262
# verify bundle, which has no prerequisites
263
git bundle verify 1.bdl |
264
make_user_friendly_and_stable_output >actual &&
265
- test_i18ncmp expect actual &&
265
+ test_cmp expect actual &&
266
267
git bundle verify stdin-1.bdl |
268
make_user_friendly_and_stable_output >actual &&
269
- test_i18ncmp expect actual &&
269
+ test_cmp expect actual &&
270
271
test_bundle_object_count 1.bdl 24 &&
272
test_bundle_object_count stdin-1.bdl 24
@@ -304,11 +304,11 @@ test_expect_success 'create bundle 2 - has prerequisites' '
304
305
git bundle verify 2.bdl |
306
make_user_friendly_and_stable_output >actual &&
307
- test_i18ncmp expect actual &&
307
+ test_cmp expect actual &&
308
309
git bundle verify stdin-2.bdl |
310
make_user_friendly_and_stable_output >actual &&
311
- test_i18ncmp expect actual &&
311
+ test_cmp expect actual &&
312
313
test_bundle_object_count 2.bdl 16 &&
314
test_bundle_object_count stdin-2.bdl 16
@@ -326,11 +326,11 @@ test_expect_success 'fail to verify bundle without prerequisites' '
326
327
test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
328
make_user_friendly_and_stable_output >actual &&
329
- test_i18ncmp expect actual &&
329
+ test_cmp expect actual &&
330
331
test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
332
make_user_friendly_and_stable_output >actual &&
333
- test_i18ncmp expect actual
333
+ test_cmp expect actual
334
'
335
336
test_expect_success 'create bundle 3 - two refs, same object' '
@@ -363,11 +363,11 @@ test_expect_success 'create bundle 3 - two refs, same object' '
363
364
git bundle verify 3.bdl |
365
make_user_friendly_and_stable_output >actual &&
366
- test_i18ncmp expect actual &&
366
+ test_cmp expect actual &&
367
368
git bundle verify stdin-3.bdl |
369
make_user_friendly_and_stable_output >actual &&
370
- test_i18ncmp expect actual &&
370
+ test_cmp expect actual &&
371
372
test_bundle_object_count 3.bdl 4 &&
373
test_bundle_object_count stdin-3.bdl 4
@@ -404,11 +404,11 @@ test_expect_success 'create bundle 4 - with tags' '
404
405
git bundle verify 4.bdl |
406
make_user_friendly_and_stable_output >actual &&
407
- test_i18ncmp expect actual &&
407
+ test_cmp expect actual &&
408
409
git bundle verify stdin-4.bdl |
410
make_user_friendly_and_stable_output >actual &&
411
- test_i18ncmp expect actual &&
411
+ test_cmp expect actual &&
412
413
test_bundle_object_count 4.bdl 3 &&
414
test_bundle_object_count stdin-4.bdl 3
t/t6030-bisect-porcelain.sh
+2
-2
@@ -829,7 +829,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
829
test_must_fail git bisect terms 1 2 &&
830
test_must_fail git bisect terms 2>actual &&
831
echo "error: no terms defined" >expected &&
832
- test_i18ncmp expected actual
832
+ test_cmp expected actual
833
'
834
835
test_expect_success 'bisect terms shows good/bad after start' '
@@ -903,7 +903,7 @@ test_expect_success 'bisect start --term-* does store terms' '
903
Your current terms are two for the old state
904
and one for the new state.
905
EOF
906
- test_i18ncmp expected actual &&
906
+ test_cmp expected actual &&
907
git bisect terms --term-bad >actual &&
908
echo one >expected &&
909
test_cmp expected actual &&
t/t6040-tracking-info.sh
+11
-11
@@ -57,7 +57,7 @@ test_expect_success 'branch -v' '
57
git branch -v
58
) |
59
sed -n -e "$t6040_script" >actual &&
60
- test_i18ncmp expect actual
60
+ test_cmp expect actual
61
'
62
63
cat >expect <<\EOF
@@ -75,7 +75,7 @@ test_expect_success 'branch -vv' '
75
git branch -vv
76
) |
77
sed -n -e "$t6040_script" >actual &&
78
- test_i18ncmp expect actual
78
+ test_cmp expect actual
79
'
80
81
test_expect_success 'checkout (diverged from upstream)' '
@@ -146,7 +146,7 @@ test_expect_success 'status -s -b (diverged from upstream)' '
146
git checkout b1 >/dev/null &&
147
git status -s -b | head -1
148
) >actual &&
149
- test_i18ncmp expect actual
149
+ test_cmp expect actual
150
'
151
152
cat >expect <<\EOF
@@ -159,7 +159,7 @@ test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
159
git checkout b1 >/dev/null &&
160
git status -s -b --no-ahead-behind | head -1
161
) >actual &&
162
- test_i18ncmp expect actual
162
+ test_cmp expect actual
163
'
164
165
cat >expect <<\EOF
@@ -172,7 +172,7 @@ test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstre
172
git checkout b1 >/dev/null &&
173
git -c status.aheadbehind=false status -s -b | head -1
174
) >actual &&
175
- test_i18ncmp expect actual
175
+ test_cmp expect actual
176
'
177
178
cat >expect <<\EOF
@@ -187,7 +187,7 @@ test_expect_success 'status --long --branch' '
187
git checkout b1 >/dev/null &&
188
git status --long -b | head -3
189
) >actual &&
190
- test_i18ncmp expect actual
190
+ test_cmp expect actual
191
'
192
193
test_expect_success 'status --long --branch' '
@@ -196,7 +196,7 @@ test_expect_success 'status --long --branch' '
196
git checkout b1 >/dev/null &&
197
git -c status.aheadbehind=true status --long -b | head -3
198
) >actual &&
199
- test_i18ncmp expect actual
199
+ test_cmp expect actual
200
'
201
202
cat >expect <<\EOF
@@ -210,7 +210,7 @@ test_expect_success 'status --long --branch --no-ahead-behind' '
210
git checkout b1 >/dev/null &&
211
git status --long -b --no-ahead-behind | head -2
212
) >actual &&
213
- test_i18ncmp expect actual
213
+ test_cmp expect actual
214
'
215
216
test_expect_success 'status.aheadbehind=false status --long --branch' '
@@ -219,7 +219,7 @@ test_expect_success 'status.aheadbehind=false status --long --branch' '
219
git checkout b1 >/dev/null &&
220
git -c status.aheadbehind=false status --long -b | head -2
221
) >actual &&
222
- test_i18ncmp expect actual
222
+ test_cmp expect actual
223
'
224
225
cat >expect <<\EOF
@@ -232,7 +232,7 @@ test_expect_success 'status -s -b (upstream is gone)' '
232
git checkout b5 >/dev/null &&
233
git status -s -b | head -1
234
) >actual &&
235
- test_i18ncmp expect actual
235
+ test_cmp expect actual
236
'
237
238
cat >expect <<\EOF
@@ -245,7 +245,7 @@ test_expect_success 'status -s -b (up-to-date with upstream)' '
245
git checkout b6 >/dev/null &&
246
git status -s -b | head -1
247
) >actual &&
248
- test_i18ncmp expect actual
248
+ test_cmp expect actual
249
'
250
251
test_expect_success 'fail to track lightweight tags' '
t/t6120-describe.sh
+1
-1
@@ -136,7 +136,7 @@ warning: tag 'Q' is externally known as 'A'
136
EOF
137
check_describe A-* HEAD
138
test_expect_success 'warning was displayed for Q' '
139
- test_i18ncmp err.expect err.actual
139
+ test_cmp err.expect err.actual
140
'
141
test_expect_success 'misnamed annotated tag forces long output' '
142
description=$(git describe --no-long Q^0) &&
t/t6134-pathspec-in-submodule.sh
+1
-1
@@ -21,7 +21,7 @@ EOF
21
test_expect_success 'error message for path inside submodule' '
22
echo a >sub/a &&
23
test_must_fail git add sub/a 2>actual &&
24
- test_i18ncmp expect actual
24
+ test_cmp expect actual
25
'
26
27
test_expect_success 'error message for path inside submodule from within submodule' '
t/t6301-for-each-ref-errors.sh
+5
-5
@@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' '
20
test_when_finished "rm -f .git/$r" &&
21
echo "warning: ignoring broken ref $r" >broken-err &&
22
git for-each-ref >out 2>err &&
23
- test_i18ncmp full-list out &&
24
- test_i18ncmp broken-err err
23
+ test_cmp full-list out &&
24
+ test_cmp broken-err err
25
'
26
27
test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '
31
echo "warning: ignoring broken ref $r" >zeros-err &&
32
git for-each-ref >out 2>err &&
33
test_cmp full-list out &&
34
- test_i18ncmp zeros-err err &&
34
+ test_cmp zeros-err err &&
35
git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
36
test_cmp brief-list brief-out &&
37
- test_i18ncmp zeros-err brief-err
37
+ test_cmp zeros-err brief-err
38
'
39
40
test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' '
43
test_when_finished "rm -f .git/$r" &&
44
echo "fatal: missing object $MISSING for $r" >missing-err &&
45
test_must_fail git for-each-ref 2>err &&
46
- test_i18ncmp missing-err err &&
46
+ test_cmp missing-err err &&
47
(
48
cat brief-list &&
49
echo "$MISSING $r"
t/t6436-merge-overwrite.sh
+2
-2
@@ -139,7 +139,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
139
cp important sub &&
140
cp important sub2 &&
141
test_must_fail git merge sub 2>out &&
142
- test_i18ncmp out expect &&
142
+ test_cmp out expect &&
143
test_path_is_missing .git/MERGE_HEAD &&
144
test_cmp important sub &&
145
test_cmp important sub2 &&
@@ -174,7 +174,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
174
git checkout --orphan new &&
175
cp important c0.c &&
176
test_must_fail git merge c0 2>out &&
177
- test_i18ncmp out expect
177
+ test_cmp out expect
178
'
179
180
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
t/t6439-merge-co-error-msgs.sh
+6
-6
@@ -40,14 +40,14 @@ EOF
40
41
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
42
test_must_fail git merge branch 2>out &&
43
- test_i18ncmp out expect &&
43
+ test_cmp out expect &&
44
git commit --allow-empty -m empty &&
45
(
46
GIT_MERGE_VERBOSITY=0 &&
47
export GIT_MERGE_VERBOSITY &&
48
test_must_fail git merge branch 2>out2
49
) &&
50
- test_i18ncmp out2 expect &&
50
+ test_cmp out2 expect &&
51
git reset --hard HEAD^
52
'
53
@@ -68,7 +68,7 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
68
git add three &&
69
git add four &&
70
test_must_fail git merge branch 2>out &&
71
- test_i18ncmp out expect
71
+ test_cmp out expect
72
'
73
74
cat >expect <<\EOF
@@ -90,7 +90,7 @@ test_expect_success 'cannot switch branches because of local changes' '
90
echo uno >rep/one &&
91
echo dos >rep/two &&
92
test_must_fail git checkout branch 2>out &&
93
- test_i18ncmp out expect
93
+ test_cmp out expect
94
'
95
96
cat >expect <<\EOF
@@ -104,7 +104,7 @@ EOF
104
test_expect_success 'not uptodate file porcelain checkout error' '
105
git add rep/one rep/two &&
106
test_must_fail git checkout branch 2>out &&
107
- test_i18ncmp out expect
107
+ test_cmp out expect
108
'
109
110
cat >expect <<\EOF
@@ -135,7 +135,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
135
>rep/untracked-file &&
136
>rep2/untracked-file &&
137
test_must_fail git checkout branch 2>out &&
138
- test_i18ncmp out ../expect
138
+ test_cmp out ../expect
139
'
140
141
test_done
t/t7001-mv.sh
+1
-1
@@ -446,7 +446,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
446
echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
447
mkdir mod &&
448
git mv sub mod/sub 2>actual.err &&
449
- test_i18ncmp expect.err actual.err &&
449
+ test_cmp expect.err actual.err &&
450
! test -e sub &&
451
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
452
(
t/t7004-tag.sh
+4
-4
@@ -91,7 +91,7 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' '
91
git tag --create-reflog tag_with_reflog &&
92
git reflog exists refs/tags/tag_with_reflog &&
93
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
94
- test_i18ncmp expected actual
94
+ test_cmp expected actual
95
'
96
97
test_expect_success 'annotated tag with --create-reflog has correct message' '
@@ -102,7 +102,7 @@ test_expect_success 'annotated tag with --create-reflog has correct message' '
102
git tag -m "annotated tag" --create-reflog tag_with_reflog &&
103
git reflog exists refs/tags/tag_with_reflog &&
104
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
105
- test_i18ncmp expected actual
105
+ test_cmp expected actual
106
'
107
108
test_expect_success '--create-reflog does not create reflog on failure' '
@@ -1409,7 +1409,7 @@ test_expect_success 'message in editor has initial comment: first line' '
1409
# check the first line --- should be empty
1410
echo >first.expect &&
1411
sed -e 1q <actual >first.actual &&
1412
- test_i18ncmp first.expect first.actual
1412
+ test_cmp first.expect first.actual
1413
'
1414
1415
test_expect_success \
@@ -1732,7 +1732,7 @@ test_expect_success 'recursive tagging should give advice' '
1732
hint: Disable this message with "git config advice.nestedTag false"
1733
EOF
1734
git tag -m nested nested annotated-v4.0 2>actual &&
1735
- test_i18ncmp expect actual
1735
+ test_cmp expect actual
1736
'
1737
1738
test_expect_success 'multiple --points-at are OR-ed together' '
t/t7012-skip-worktree-writing.sh
+2
-2
@@ -125,13 +125,13 @@ EOF
125
test_expect_success 'git-clean, absent case' '
126
setup_absent &&
127
git clean -n > result &&
128
- test_i18ncmp expected result
128
+ test_cmp expected result
129
'
130
131
test_expect_success 'git-clean, dirty case' '
132
setup_dirty &&
133
git clean -n > result &&
134
- test_i18ncmp expected result
134
+ test_cmp expected result
135
'
136
137
test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
t/t7060-wtstatus.sh
+7
-7
@@ -56,9 +56,9 @@ EOF
56
git commit -m delete &&
57
test_must_fail git merge main &&
58
test_must_fail git commit --dry-run >../actual &&
59
- test_i18ncmp ../expect ../actual &&
59
+ test_cmp ../expect ../actual &&
60
git status >../actual &&
61
- test_i18ncmp ../expect ../actual
61
+ test_cmp ../expect ../actual
62
)
63
'
64
@@ -151,7 +151,7 @@ Unmerged paths:
151
no changes added to commit (use "git add" and/or "git commit -a")
152
EOF
153
git status --untracked-files=no >actual &&
154
- test_i18ncmp expected actual
154
+ test_cmp expected actual
155
'
156
157
@@ -185,7 +185,7 @@ Unmerged paths:
185
no changes added to commit (use "git add" and/or "git commit -a")
186
EOF
187
git status --untracked-files=no >actual &&
188
- test_i18ncmp expected actual
188
+ test_cmp expected actual
189
'
190
191
@@ -210,7 +210,7 @@ Unmerged paths:
210
Untracked files not listed (use -u option to show untracked files)
211
EOF
212
git status --untracked-files=no >actual &&
213
- test_i18ncmp expected actual &&
213
+ test_cmp expected actual &&
214
git reset --hard &&
215
git checkout main
216
'
@@ -227,7 +227,7 @@ test_expect_success 'status --branch with detached HEAD' '
227
?? expected
228
?? mdconflict/
229
EOF
230
- test_i18ncmp expected actual
230
+ test_cmp expected actual
231
'
232
233
## Duplicate the above test and verify --porcelain=v1 arg parsing.
@@ -243,7 +243,7 @@ test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
243
?? expected
244
?? mdconflict/
245
EOF
246
- test_i18ncmp expected actual
246
+ test_cmp expected actual
247
'
248
249
## Verify parser error on invalid --porcelain argument.
t/t7063-status-untracked-cache.sh
+1
-1
@@ -731,7 +731,7 @@ test_expect_success 'test ident field is working' '
731
cp -R done dthree dtwo four three ../other_worktree &&
732
GIT_WORK_TREE=../other_worktree git status 2>../err &&
733
echo "warning: untracked cache is disabled on this system or location" >../expect &&
734
- test_i18ncmp ../expect ../err
734
+ test_cmp ../expect ../err
735
'
736
737
test_expect_success 'untracked cache survives a checkout' '
t/t7102-reset.sh
+3
-3
@@ -75,14 +75,14 @@ test_expect_success 'reset --hard message' '
75
hex=$(git log -1 --format="%h") &&
76
git reset --hard >.actual &&
77
echo HEAD is now at $hex $(commit_msg) >.expected &&
78
- test_i18ncmp .expected .actual
78
+ test_cmp .expected .actual
79
'
80
81
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
82
hex=$(git log -1 --format="%h") &&
83
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
84
echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
85
- test_i18ncmp .expected .actual
85
+ test_cmp .expected .actual
86
'
87
88
test_expect_success 'giving a non existing revision should fail' '
@@ -469,7 +469,7 @@ test_expect_success '--mixed refreshes the index' '
469
EOF
470
echo 123 >>file2 &&
471
git reset --mixed HEAD >output &&
472
- test_i18ncmp expect output
472
+ test_cmp expect output
473
'
474
475
test_expect_success 'resetting specific path that is unmerged' '
t/t7400-submodule-basic.sh
+2
-2
@@ -55,7 +55,7 @@ test_expect_success 'add aborts on repository with no commits' '
55
EOF
56
git init repo-no-commits &&
57
test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
58
- test_i18ncmp expect actual
58
+ test_cmp expect actual
59
'
60
61
test_expect_success 'status should ignore inner git repo when not added' '
@@ -185,7 +185,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
185
git add --force .gitignore &&
186
git commit -m"Ignore everything" &&
187
! git submodule add "$submodurl" submod >actual 2>&1 &&
188
- test_i18ncmp expect actual
188
+ test_cmp expect actual
189
)
190
'
191
t/t7401-submodule-summary.sh
+6
-6
@@ -190,7 +190,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' "
190
< Add foo5
191
192
EOF
193
- test_i18ncmp expected actual
193
+ test_cmp expected actual
194
"
195
196
test_expect_success 'typechanged submodule(submodule->blob), --files' "
@@ -200,7 +200,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' "
200
> Add foo5
201
202
EOF
203
- test_i18ncmp expected actual
203
+ test_cmp expected actual
204
"
205
206
rm -rf sm1 &&
@@ -211,7 +211,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' "
211
* sm1 $head4(submodule)->$head5(blob):
212
213
EOF
214
- test_i18ncmp expected actual
214
+ test_cmp expected actual
215
"
216
217
rm -f sm1 &&
@@ -224,7 +224,7 @@ test_expect_success 'nonexistent commit' "
224
Warn: sm1 doesn't contain commit $head4_full
225
226
EOF
227
- test_i18ncmp expected actual
227
+ test_cmp expected actual
228
"
229
230
commit_file
@@ -235,7 +235,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' "
235
> Add foo7
236
237
EOF
238
- test_i18ncmp expected actual
238
+ test_cmp expected actual
239
"
240
241
commit_file sm1 &&
@@ -292,7 +292,7 @@ test_expect_success 'given commit' "
292
293
test_expect_success '--for-status' "
294
git submodule summary --for-status HEAD^ >actual &&
295
- test_i18ncmp - actual <<-EOF
295
+ test_cmp - actual <<-EOF
296
* sm1 $head6...0000000:
297
298
* sm2 0000000...$head7 (2):
t/t7406-submodule-update.sh
+8
-8
@@ -155,9 +155,9 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
155
cd tmp &&
156
git submodule update --init --recursive ../super >../../actual 2>../../actual2
157
) &&
158
- test_i18ncmp expect actual &&
158
+ test_cmp expect actual &&
159
sort actual2 >actual2.sorted &&
160
- test_i18ncmp expect2 actual2.sorted
160
+ test_cmp expect2 actual2.sorted
161
'
162
163
cat <<EOF >expect2
@@ -174,7 +174,7 @@ test_expect_success 'submodule update --init from and of subdirectory' '
174
git submodule update --init sub 2>../../actual2
175
)
176
) &&
177
- test_i18ncmp expect2 actual2
177
+ test_cmp expect2 actual2
178
'
179
180
test_expect_success 'submodule update does not fetch already present commits' '
@@ -192,7 +192,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
192
(cd super &&
193
git submodule update > ../actual 2> ../actual.err
194
) &&
195
- test_i18ncmp expected actual &&
195
+ test_cmp expected actual &&
196
test_must_be_empty actual.err
197
'
198
@@ -461,7 +461,7 @@ test_expect_success 'submodule update - command in .git/config catches failure'
461
(cd super &&
462
test_must_fail git submodule update submodule 2>../actual
463
) &&
464
- test_i18ncmp actual expect
464
+ test_cmp actual expect
465
'
466
467
cat << EOF >expect
@@ -479,7 +479,7 @@ test_expect_success 'submodule update - command in .git/config catches failure -
479
mkdir tmp && cd tmp &&
480
test_must_fail git submodule update ../submodule 2>../../actual
481
) &&
482
- test_i18ncmp actual expect
482
+ test_cmp actual expect
483
'
484
485
test_expect_success 'submodule update - command run for initial population of submodule' '
@@ -488,7 +488,7 @@ test_expect_success 'submodule update - command run for initial population of su
488
EOF
489
rm -rf super/submodule &&
490
test_must_fail git -C super submodule update 2>actual &&
491
- test_i18ncmp expect actual &&
491
+ test_cmp expect actual &&
492
git -C super submodule update --checkout
493
'
494
@@ -509,7 +509,7 @@ test_expect_success 'recursive submodule update - command in .git/config catches
509
mkdir -p tmp && cd tmp &&
510
test_must_fail git submodule update --recursive ../super 2>../../actual
511
) &&
512
- test_i18ncmp actual expect
512
+ test_cmp actual expect
513
'
514
515
test_expect_success 'submodule init does not copy command into .git/config' '
t/t7407-submodule-foreach.sh
+5
-5
@@ -80,7 +80,7 @@ test_expect_success 'test basic "submodule foreach" usage' '
80
git config foo.bar zar &&
81
git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
82
) &&
83
- test_i18ncmp expect actual
83
+ test_cmp expect actual
84
'
85
86
cat >expect <<EOF
@@ -96,7 +96,7 @@ test_expect_success 'test "submodule foreach" from subdirectory' '
96
cd clone/sub &&
97
git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
98
) &&
99
- test_i18ncmp expect actual
99
+ test_cmp expect actual
100
'
101
102
test_expect_success 'setup nested submodules' '
@@ -177,7 +177,7 @@ test_expect_success 'test messages from "foreach --recursive"' '
177
cd clone2 &&
178
git submodule foreach --recursive "true" > ../actual
179
) &&
180
- test_i18ncmp expect actual
180
+ test_cmp expect actual
181
'
182
183
cat > expect <<EOF
@@ -197,7 +197,7 @@ test_expect_success 'test messages from "foreach --recursive" from subdirectory'
197
cd untracked &&
198
git submodule foreach --recursive >../../actual
199
) &&
200
- test_i18ncmp expect actual
200
+ test_cmp expect actual
201
'
202
sub1sha1=$(cd clone2/sub1 && git rev-parse HEAD)
203
sub2sha1=$(cd clone2/sub2 && git rev-parse HEAD)
@@ -229,7 +229,7 @@ test_expect_success 'test "submodule foreach --recursive" from subdirectory' '
229
cd clone2/untracked &&
230
git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
231
) &&
232
- test_i18ncmp expect actual
232
+ test_cmp expect actual
233
'
234
235
cat > expect <<EOF
t/t7500-commit-template-squash-signoff.sh
+2
-2
@@ -15,7 +15,7 @@ commit_msg_is () {
15
16
printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
17
printf "%s" "$1" >"$expect" &&
18
- test_i18ncmp "$expect" "$actual"
18
+ test_cmp "$expect" "$actual"
19
}
20
21
# A sanity check to see if commit is working at all.
@@ -356,7 +356,7 @@ test_expect_success 'new line found before status message in commit template' '
356
touch commit-template-check &&
357
git add commit-template-check &&
358
GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
359
- test_i18ncmp expected-template editor-input
359
+ test_cmp expected-template editor-input
360
'
361
362
test_expect_success 'setup empty commit with unstaged rename and copy' '
t/t7502-commit-porcelain.sh
+3
-3
@@ -13,7 +13,7 @@ commit_msg_is () {
13
14
printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
15
printf "%s" "$1" >$expect &&
16
- test_i18ncmp $expect $actual
16
+ test_cmp $expect $actual
17
}
18
19
# Arguments: [<prefix] [<commit message>] [<commit options>]
@@ -35,7 +35,7 @@ check_summary_oneline() {
35
SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
36
echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&
37
38
- test_i18ncmp exp act
38
+ test_cmp exp act
39
}
40
41
test_expect_success 'output summary format' '
@@ -300,7 +300,7 @@ echo "sample
300
# with '#' will be ignored, and an empty message aborts the commit." >expect
301
302
test_expect_success 'cleanup commit messages (strip option,-F,-e): output' '
303
- test_i18ncmp expect actual
303
+ test_cmp expect actual
304
'
305
306
test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' '
t/t7508-status.sh
+55
-55
@@ -109,13 +109,13 @@ test_expect_success 'status --column' '
109
#
110
EOF
111
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
112
- test_i18ncmp expect output
112
+ test_cmp expect output
113
'
114
115
test_expect_success 'status --column status.displayCommentPrefix=false' '
116
strip_comments expect &&
117
COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
118
- test_i18ncmp expect output
118
+ test_cmp expect output
119
'
120
121
cat >expect <<\EOF
@@ -144,19 +144,19 @@ EOF
144
145
test_expect_success 'status with status.displayCommentPrefix=true' '
146
git -c status.displayCommentPrefix=true status >output &&
147
- test_i18ncmp expect output
147
+ test_cmp expect output
148
'
149
150
test_expect_success 'status with status.displayCommentPrefix=false' '
151
strip_comments expect &&
152
git -c status.displayCommentPrefix=false status >output &&
153
- test_i18ncmp expect output
153
+ test_cmp expect output
154
'
155
156
test_expect_success 'status -v' '
157
(cat expect && git diff --cached) >expect-with-v &&
158
git status -v >output &&
159
- test_i18ncmp expect-with-v output
159
+ test_cmp expect-with-v output
160
'
161
162
test_expect_success 'status -v -v' '
@@ -167,7 +167,7 @@ test_expect_success 'status -v -v' '
167
echo "Changes not staged for commit:" &&
168
git -c diff.mnemonicprefix=true diff) >expect-with-v &&
169
git status -v -v >output &&
170
- test_i18ncmp expect-with-v output
170
+ test_cmp expect-with-v output
171
'
172
173
test_expect_success 'setup fake editor' '
@@ -214,7 +214,7 @@ EOF
214
test_expect_success 'status (advice.statusHints false)' '
215
test_config advice.statusHints false &&
216
git status >output &&
217
- test_i18ncmp expect output
217
+ test_cmp expect output
218
219
'
220
@@ -296,7 +296,7 @@ Ignored files:
296
297
EOF
298
git status --ignored >output &&
299
- test_i18ncmp expect output
299
+ test_cmp expect output
300
'
301
302
test_expect_success 'status with gitignore (nothing untracked)' '
@@ -358,7 +358,7 @@ Ignored files:
358
359
EOF
360
git status --ignored >output &&
361
- test_i18ncmp expect output
361
+ test_cmp expect output
362
'
363
364
cat >.gitignore <<\EOF
@@ -380,7 +380,7 @@ EOF
380
test_expect_success 'status -s -b' '
381
382
git status -s -b >output &&
383
- test_i18ncmp expect output
383
+ test_cmp expect output
384
385
'
386
@@ -390,7 +390,7 @@ test_expect_success 'status -s -z -b' '
390
git status -s -z -b >output &&
391
nul_to_q <output >output.q &&
392
mv output.q output &&
393
- test_i18ncmp expect output
393
+ test_cmp expect output
394
'
395
396
test_expect_success 'setup dir3' '
@@ -418,13 +418,13 @@ Changes not staged for commit:
418
Untracked files not listed (use -u option to show untracked files)
419
EOF
420
git status -uno >output &&
421
- test_i18ncmp expect output
421
+ test_cmp expect output
422
'
423
424
test_expect_success 'status (status.showUntrackedFiles no)' '
425
test_config status.showuntrackedfiles no &&
426
git status >output &&
427
- test_i18ncmp expect output
427
+ test_cmp expect output
428
'
429
430
test_expect_success 'status -uno (advice.statusHints false)' '
@@ -443,7 +443,7 @@ Untracked files not listed
443
EOF
444
test_config advice.statusHints false &&
445
git status -uno >output &&
446
- test_i18ncmp expect output
446
+ test_cmp expect output
447
'
448
449
cat >expect << EOF
@@ -487,13 +487,13 @@ Untracked files:
487
488
EOF
489
git status -unormal >output &&
490
- test_i18ncmp expect output
490
+ test_cmp expect output
491
'
492
493
test_expect_success 'status (status.showUntrackedFiles normal)' '
494
test_config status.showuntrackedfiles normal &&
495
git status >output &&
496
- test_i18ncmp expect output
496
+ test_cmp expect output
497
'
498
499
cat >expect <<EOF
@@ -543,13 +543,13 @@ Untracked files:
543
544
EOF
545
git status -uall >output &&
546
- test_i18ncmp expect output
546
+ test_cmp expect output
547
'
548
549
test_expect_success 'status (status.showUntrackedFiles all)' '
550
test_config status.showuntrackedfiles all &&
551
git status >output &&
552
- test_i18ncmp expect output
552
+ test_cmp expect output
553
'
554
555
test_expect_success 'teardown dir3' '
@@ -601,7 +601,7 @@ Untracked files:
601
602
EOF
603
(cd dir1 && git status) >output &&
604
- test_i18ncmp expect output
604
+ test_cmp expect output
605
'
606
607
cat >expect <<\EOF
@@ -670,13 +670,13 @@ Untracked files:
670
EOF
671
test_config color.ui auto &&
672
test_terminal git status | test_decode_color >output &&
673
- test_i18ncmp expect output
673
+ test_cmp expect output
674
'
675
676
test_expect_success TTY 'status with color.status' '
677
test_config color.status auto &&
678
test_terminal git status | test_decode_color >output &&
679
- test_i18ncmp expect output
679
+ test_cmp expect output
680
'
681
682
cat >expect <<\EOF
@@ -718,7 +718,7 @@ EOF
718
test_expect_success TTY 'status -s -b with color.status' '
719
720
test_terminal git status -s -b | test_decode_color >output &&
721
- test_i18ncmp expect output
721
+ test_cmp expect output
722
723
'
724
@@ -793,7 +793,7 @@ Untracked files:
793
EOF
794
test_config status.relativePaths false &&
795
(cd dir1 && git status) >output &&
796
- test_i18ncmp expect output
796
+ test_cmp expect output
797
798
'
799
@@ -860,7 +860,7 @@ Untracked files:
860
861
EOF
862
git commit --dry-run dir1/modified >output &&
863
- test_i18ncmp expect output
863
+ test_cmp expect output
864
'
865
866
cat >expect <<EOF
@@ -921,13 +921,13 @@ Untracked files:
921
922
EOF
923
git status >output &&
924
- test_i18ncmp expect output
924
+ test_cmp expect output
925
'
926
927
# we expect the same as the previous test
928
test_expect_success 'status --untracked-files=all does not show submodule' '
929
git status --untracked-files=all >output &&
930
- test_i18ncmp expect output
930
+ test_cmp expect output
931
'
932
933
cat >expect <<EOF
@@ -984,13 +984,13 @@ Untracked files:
984
EOF
985
git config status.submodulesummary 10 &&
986
git status >output &&
987
- test_i18ncmp expect output
987
+ test_cmp expect output
988
'
989
990
test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
991
strip_comments expect &&
992
git -c status.displayCommentPrefix=false status >output &&
993
- test_i18ncmp expect output
993
+ test_cmp expect output
994
'
995
996
test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
@@ -1035,9 +1035,9 @@ EOF
1035
git commit -m "commit submodule" &&
1036
git config status.submodulesummary 10 &&
1037
test_must_fail git commit --dry-run >output &&
1038
- test_i18ncmp expect output &&
1038
+ test_cmp expect output &&
1039
git status >output &&
1040
- test_i18ncmp expect output
1040
+ test_cmp expect output
1041
'
1042
1043
cat >expect <<EOF
@@ -1091,7 +1091,7 @@ Untracked files:
1091
EOF
1092
git config status.submodulesummary 10 &&
1093
git commit --dry-run --amend >output &&
1094
- test_i18ncmp expect output
1094
+ test_cmp expect output
1095
'
1096
1097
test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
@@ -1143,17 +1143,17 @@ Untracked files:
1143
EOF
1144
echo modified sm/untracked &&
1145
git status --ignore-submodules=untracked >output &&
1146
- test_i18ncmp expect output
1146
+ test_cmp expect output
1147
'
1148
1149
test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
1150
test_config diff.ignoreSubmodules dirty &&
1151
git status >output &&
1152
- test_i18ncmp expect output &&
1152
+ test_cmp expect output &&
1153
git config --add -f .gitmodules submodule.subname.ignore untracked &&
1154
git config --add -f .gitmodules submodule.subname.path sm &&
1155
git status >output &&
1156
- test_i18ncmp expect output &&
1156
+ test_cmp expect output &&
1157
git config -f .gitmodules --remove-section submodule.subname
1158
'
1159
@@ -1163,14 +1163,14 @@ test_expect_success '.git/config ignore=untracked suppresses submodules with unt
1163
git config --add submodule.subname.ignore untracked &&
1164
git config --add submodule.subname.path sm &&
1165
git status >output &&
1166
- test_i18ncmp expect output &&
1166
+ test_cmp expect output &&
1167
git config --remove-section submodule.subname &&
1168
git config --remove-section -f .gitmodules submodule.subname
1169
'
1170
1171
test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
1172
git status --ignore-submodules=dirty >output &&
1173
- test_i18ncmp expect output
1173
+ test_cmp expect output
1174
'
1175
1176
test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
@@ -1180,7 +1180,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack
1180
git config --add -f .gitmodules submodule.subname.ignore dirty &&
1181
git config --add -f .gitmodules submodule.subname.path sm &&
1182
git status >output &&
1183
- test_i18ncmp expect output &&
1183
+ test_cmp expect output &&
1184
git config -f .gitmodules --remove-section submodule.subname
1185
'
1186
@@ -1190,7 +1190,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
1190
git config --add submodule.subname.ignore dirty &&
1191
git config --add submodule.subname.path sm &&
1192
git status >output &&
1193
- test_i18ncmp expect output &&
1193
+ test_cmp expect output &&
1194
git config --remove-section submodule.subname &&
1195
git config -f .gitmodules --remove-section submodule.subname
1196
'
@@ -1198,14 +1198,14 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
1198
test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
1199
echo modified >sm/foo &&
1200
git status --ignore-submodules=dirty >output &&
1201
- test_i18ncmp expect output
1201
+ test_cmp expect output
1202
'
1203
1204
test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
1205
git config --add -f .gitmodules submodule.subname.ignore dirty &&
1206
git config --add -f .gitmodules submodule.subname.path sm &&
1207
git status >output &&
1208
- test_i18ncmp expect output &&
1208
+ test_cmp expect output &&
1209
git config -f .gitmodules --remove-section submodule.subname
1210
'
1211
@@ -1215,7 +1215,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie
1215
git config --add submodule.subname.ignore dirty &&
1216
git config --add submodule.subname.path sm &&
1217
git status >output &&
1218
- test_i18ncmp expect output &&
1218
+ test_cmp expect output &&
1219
git config --remove-section submodule.subname &&
1220
git config -f .gitmodules --remove-section submodule.subname
1221
'
@@ -1253,14 +1253,14 @@ Untracked files:
1253
1254
EOF
1255
git status --ignore-submodules=untracked > output &&
1256
- test_i18ncmp expect output
1256
+ test_cmp expect output
1257
'
1258
1259
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
1260
git config --add -f .gitmodules submodule.subname.ignore untracked &&
1261
git config --add -f .gitmodules submodule.subname.path sm &&
1262
git status >output &&
1263
- test_i18ncmp expect output &&
1263
+ test_cmp expect output &&
1264
git config -f .gitmodules --remove-section submodule.subname
1265
'
1266
@@ -1270,7 +1270,7 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodules wi
1270
git config --add submodule.subname.ignore untracked &&
1271
git config --add submodule.subname.path sm &&
1272
git status >output &&
1273
- test_i18ncmp expect output &&
1273
+ test_cmp expect output &&
1274
git config --remove-section submodule.subname &&
1275
git config -f .gitmodules --remove-section submodule.subname
1276
'
@@ -1314,14 +1314,14 @@ Untracked files:
1314
1315
EOF
1316
git status --ignore-submodules=untracked > output &&
1317
- test_i18ncmp expect output
1317
+ test_cmp expect output
1318
'
1319
1320
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
1321
git config --add -f .gitmodules submodule.subname.ignore untracked &&
1322
git config --add -f .gitmodules submodule.subname.path sm &&
1323
git status >output &&
1324
- test_i18ncmp expect output &&
1324
+ test_cmp expect output &&
1325
git config -f .gitmodules --remove-section submodule.subname
1326
'
1327
@@ -1331,20 +1331,20 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodule sum
1331
git config --add submodule.subname.ignore untracked &&
1332
git config --add submodule.subname.path sm &&
1333
git status >output &&
1334
- test_i18ncmp expect output &&
1334
+ test_cmp expect output &&
1335
git config --remove-section submodule.subname &&
1336
git config -f .gitmodules --remove-section submodule.subname
1337
'
1338
1339
test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
1340
git status --ignore-submodules=dirty > output &&
1341
- test_i18ncmp expect output
1341
+ test_cmp expect output
1342
'
1343
test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
1344
git config --add -f .gitmodules submodule.subname.ignore dirty &&
1345
git config --add -f .gitmodules submodule.subname.path sm &&
1346
git status >output &&
1347
- test_i18ncmp expect output &&
1347
+ test_cmp expect output &&
1348
git config -f .gitmodules --remove-section submodule.subname
1349
'
1350
@@ -1354,7 +1354,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary
1354
git config --add submodule.subname.ignore dirty &&
1355
git config --add submodule.subname.path sm &&
1356
git status >output &&
1357
- test_i18ncmp expect output &&
1357
+ test_cmp expect output &&
1358
git config --remove-section submodule.subname &&
1359
git config -f .gitmodules --remove-section submodule.subname
1360
'
@@ -1398,7 +1398,7 @@ EOF
1398
test_expect_success "status (core.commentchar with submodule summary)" '
1399
test_config core.commentchar ";" &&
1400
git -c status.displayCommentPrefix=true status >output &&
1401
- test_i18ncmp expect output
1401
+ test_cmp expect output
1402
'
1403
1404
test_expect_success "status (core.commentchar with two chars with submodule summary)" '
@@ -1429,7 +1429,7 @@ Untracked files:
1429
no changes added to commit (use "git add" and/or "git commit -a")
1430
EOF
1431
git status --ignore-submodules=all > output &&
1432
- test_i18ncmp expect output
1432
+ test_cmp expect output
1433
'
1434
1435
test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
@@ -1460,7 +1460,7 @@ EOF
1460
git config --add -f .gitmodules submodule.subname.ignore all &&
1461
git config --add -f .gitmodules submodule.subname.path sm &&
1462
git status > output &&
1463
- test_i18ncmp expect output &&
1463
+ test_cmp expect output &&
1464
git config -f .gitmodules --remove-section submodule.subname
1465
'
1466
@@ -1470,7 +1470,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
1470
git config --add submodule.subname.ignore all &&
1471
git config --add submodule.subname.path sm &&
1472
git status > output &&
1473
- test_i18ncmp expect output &&
1473
+ test_cmp expect output &&
1474
git config --remove-section submodule.subname &&
1475
git config -f .gitmodules --remove-section submodule.subname
1476
'
@@ -1571,7 +1571,7 @@ Changes not staged for commit:
1571
Untracked files not listed (use -u option to show untracked files)
1572
EOF
1573
git commit -uno --dry-run >output &&
1574
- test_i18ncmp expect output &&
1574
+ test_cmp expect output &&
1575
git status -s --ignore-submodules=dirty >output &&
1576
test_i18ngrep "^M. sm" output
1577
'
t/t7512-status-help.sh
+37
-37
@@ -41,7 +41,7 @@ Unmerged paths:
41
no changes added to commit (use "git add" and/or "git commit -a")
42
EOF
43
git status --untracked-files=no >actual &&
44
- test_i18ncmp expected actual
44
+ test_cmp expected actual
45
'
46
47
@@ -61,7 +61,7 @@ Changes to be committed:
61
Untracked files not listed (use -u option to show untracked files)
62
EOF
63
git status --untracked-files=no >actual &&
64
- test_i18ncmp expected actual
64
+ test_cmp expected actual
65
'
66
67
@@ -93,7 +93,7 @@ Unmerged paths:
93
no changes added to commit (use "git add" and/or "git commit -a")
94
EOF
95
git status --untracked-files=no >actual &&
96
- test_i18ncmp expected actual
96
+ test_cmp expected actual
97
'
98
99
@@ -116,7 +116,7 @@ Changes to be committed:
116
Untracked files not listed (use -u option to show untracked files)
117
EOF
118
git status --untracked-files=no >actual &&
119
- test_i18ncmp expected actual
119
+ test_cmp expected actual
120
'
121
122
@@ -154,7 +154,7 @@ Unmerged paths:
154
no changes added to commit (use "git add" and/or "git commit -a")
155
EOF
156
git status --untracked-files=no >actual &&
157
- test_i18ncmp expected actual
157
+ test_cmp expected actual
158
'
159
160
@@ -180,7 +180,7 @@ Changes to be committed:
180
Untracked files not listed (use -u option to show untracked files)
181
EOF
182
git status --untracked-files=no >actual &&
183
- test_i18ncmp expected actual
183
+ test_cmp expected actual
184
'
185
186
@@ -210,7 +210,7 @@ You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' o
210
nothing to commit (use -u to show untracked files)
211
EOF
212
git status --untracked-files=no >actual &&
213
- test_i18ncmp expected actual
213
+ test_cmp expected actual
214
'
215
216
@@ -249,7 +249,7 @@ Changes not staged for commit:
249
no changes added to commit (use "git add" and/or "git commit -a")
250
EOF
251
git status --untracked-files=no >actual &&
252
- test_i18ncmp expected actual
252
+ test_cmp expected actual
253
'
254
255
@@ -282,7 +282,7 @@ You are currently editing a commit while rebasing branch '\''amend_last'\'' on '
282
nothing to commit (use -u to show untracked files)
283
EOF
284
git status --untracked-files=no >actual &&
285
- test_i18ncmp expected actual
285
+ test_cmp expected actual
286
'
287
288
@@ -321,7 +321,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
321
nothing to commit (use -u to show untracked files)
322
EOF
323
git status --untracked-files=no >actual &&
324
- test_i18ncmp expected actual
324
+ test_cmp expected actual
325
'
326
327
@@ -356,7 +356,7 @@ Changes not staged for commit:
356
no changes added to commit (use "git add" and/or "git commit -a")
357
EOF
358
git status --untracked-files=no >actual &&
359
- test_i18ncmp expected actual
359
+ test_cmp expected actual
360
'
361
362
@@ -387,7 +387,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
387
nothing to commit (use -u to show untracked files)
388
EOF
389
git status --untracked-files=no >actual &&
390
- test_i18ncmp expected actual
390
+ test_cmp expected actual
391
'
392
393
@@ -418,7 +418,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
418
nothing to commit (use -u to show untracked files)
419
EOF
420
git status --untracked-files=no >actual &&
421
- test_i18ncmp expected actual
421
+ test_cmp expected actual
422
'
423
424
@@ -454,7 +454,7 @@ Changes not staged for commit:
454
no changes added to commit (use "git add" and/or "git commit -a")
455
EOF
456
git status --untracked-files=no >actual &&
457
- test_i18ncmp expected actual
457
+ test_cmp expected actual
458
'
459
460
@@ -486,7 +486,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
486
nothing to commit (use -u to show untracked files)
487
EOF
488
git status --untracked-files=no >actual &&
489
- test_i18ncmp expected actual
489
+ test_cmp expected actual
490
'
491
492
@@ -519,7 +519,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
519
nothing to commit (use -u to show untracked files)
520
EOF
521
git status --untracked-files=no >actual &&
522
- test_i18ncmp expected actual
522
+ test_cmp expected actual
523
'
524
525
@@ -557,7 +557,7 @@ Changes not staged for commit:
557
no changes added to commit (use "git add" and/or "git commit -a")
558
EOF
559
git status --untracked-files=no >actual &&
560
- test_i18ncmp expected actual
560
+ test_cmp expected actual
561
'
562
563
@@ -591,7 +591,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
591
nothing to commit (use -u to show untracked files)
592
EOF
593
git status --untracked-files=no >actual &&
594
- test_i18ncmp expected actual
594
+ test_cmp expected actual
595
'
596
597
@@ -619,7 +619,7 @@ You are in the middle of an am session.
619
nothing to commit (use -u to show untracked files)
620
EOF
621
git status --untracked-files=no >actual &&
622
- test_i18ncmp expected actual
622
+ test_cmp expected actual
623
'
624
625
@@ -641,7 +641,7 @@ You are in the middle of an am session.
641
nothing to commit (use -u to show untracked files)
642
EOF
643
git status --untracked-files=no >actual &&
644
- test_i18ncmp expected actual
644
+ test_cmp expected actual
645
'
646
647
@@ -664,7 +664,7 @@ The current patch is empty.
664
nothing to commit (use -u to show untracked files)
665
EOF
666
git status --untracked-files=no >actual &&
667
- test_i18ncmp expected actual
667
+ test_cmp expected actual
668
'
669
670
@@ -687,7 +687,7 @@ You are currently bisecting, started from branch '\''bisect'\''.
687
nothing to commit (use -u to show untracked files)
688
EOF
689
git status --untracked-files=no >actual &&
690
- test_i18ncmp expected actual
690
+ test_cmp expected actual
691
'
692
693
@@ -712,7 +712,7 @@ Unmerged paths:
712
no changes added to commit
713
EOF
714
git status --untracked-files=no >actual &&
715
- test_i18ncmp expected actual
715
+ test_cmp expected actual
716
'
717
718
@@ -746,7 +746,7 @@ Unmerged paths:
746
no changes added to commit (use "git add" and/or "git commit -a")
747
EOF
748
git status --untracked-files=no >actual &&
749
- test_i18ncmp expected actual
749
+ test_cmp expected actual
750
'
751
752
@@ -770,7 +770,7 @@ Changes to be committed:
770
Untracked files not listed (use -u option to show untracked files)
771
EOF
772
git status --untracked-files=no >actual &&
773
- test_i18ncmp expected actual
773
+ test_cmp expected actual
774
'
775
776
test_expect_success 'status when cherry-picking after committing conflict resolution' '
@@ -789,7 +789,7 @@ Cherry-pick currently in progress.
789
nothing to commit (use -u to show untracked files)
790
EOF
791
git status --untracked-files=no >actual &&
792
- test_i18ncmp expected actual
792
+ test_cmp expected actual
793
'
794
795
test_expect_success 'status shows cherry-pick with invalid oid' '
@@ -798,7 +798,7 @@ test_expect_success 'status shows cherry-pick with invalid oid' '
798
git status --untracked-files=no >actual 2>err &&
799
git cherry-pick --quit &&
800
test_must_be_empty err &&
801
- test_i18ncmp expected actual
801
+ test_cmp expected actual
802
'
803
804
test_expect_success 'status does not show error if .git/sequencer is a file' '
@@ -816,7 +816,7 @@ HEAD detached at atag
816
nothing to commit (use -u to show untracked files)
817
EOF
818
git status --untracked-files=no >actual &&
819
- test_i18ncmp expected actual &&
819
+ test_cmp expected actual &&
820
821
git reset --hard HEAD^ &&
822
cat >expected <<\EOF &&
@@ -824,7 +824,7 @@ HEAD detached from atag
824
nothing to commit (use -u to show untracked files)
825
EOF
826
git status --untracked-files=no >actual &&
827
- test_i18ncmp expected actual
827
+ test_cmp expected actual
828
'
829
830
test_expect_success 'status while reverting commit (conflicts)' '
@@ -852,7 +852,7 @@ Unmerged paths:
852
no changes added to commit (use "git add" and/or "git commit -a")
853
EOF
854
git status --untracked-files=no >actual &&
855
- test_i18ncmp expected actual
855
+ test_cmp expected actual
856
'
857
858
test_expect_success 'status while reverting commit (conflicts resolved)' '
@@ -872,7 +872,7 @@ Changes to be committed:
872
Untracked files not listed (use -u option to show untracked files)
873
EOF
874
git status --untracked-files=no >actual &&
875
- test_i18ncmp expected actual
875
+ test_cmp expected actual
876
'
877
878
test_expect_success 'status after reverting commit' '
@@ -882,7 +882,7 @@ On branch main
882
nothing to commit (use -u to show untracked files)
883
EOF
884
git status --untracked-files=no >actual &&
885
- test_i18ncmp expected actual
885
+ test_cmp expected actual
886
'
887
888
test_expect_success 'status while reverting after committing conflict resolution' '
@@ -901,7 +901,7 @@ Revert currently in progress.
901
nothing to commit (use -u to show untracked files)
902
EOF
903
git status --untracked-files=no >actual &&
904
- test_i18ncmp expected actual
904
+ test_cmp expected actual
905
'
906
907
test_expect_success 'prepare for different number of commits rebased' '
@@ -931,7 +931,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
931
nothing to commit (use -u to show untracked files)
932
EOF
933
git status --untracked-files=no >actual &&
934
- test_i18ncmp expected actual
934
+ test_cmp expected actual
935
'
936
937
test_expect_success 'status: two commands done with some white lines in done file' '
@@ -959,7 +959,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
959
nothing to commit (use -u to show untracked files)
960
EOF
961
git status --untracked-files=no >actual &&
962
- test_i18ncmp expected actual
962
+ test_cmp expected actual
963
'
964
965
test_expect_success 'status: two remaining commands with some white lines in todo file' '
@@ -988,7 +988,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
988
nothing to commit (use -u to show untracked files)
989
EOF
990
git status --untracked-files=no >actual &&
991
- test_i18ncmp expected actual
991
+ test_cmp expected actual
992
'
993
994
test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
@@ -1007,7 +1007,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
1007
1008
nothing to commit (use -u to show untracked files)
1009
EOF
1010
- test_i18ncmp expected actual
1010
+ test_cmp expected actual
1011
'
1012
1013
test_done
t/t7519-status-fsmonitor.sh
+2
-2
@@ -236,7 +236,7 @@ test_expect_success 'refresh_index() invalidates fsmonitor cache' '
236
git reset HEAD~1 &&
237
git status >actual &&
238
git -c core.fsmonitor= status >expect &&
239
- test_i18ncmp expect actual
239
+ test_cmp expect actual
240
'
241
242
# test fsmonitor with and without preloadIndex
@@ -273,7 +273,7 @@ do
273
git add dir2/new &&
274
git status >actual &&
275
git -c core.fsmonitor= status >expect &&
276
- test_i18ncmp expect actual
276
+ test_cmp expect actual
277
'
278
279
# Make sure it's actually skipping the check for modified and untracked
t/t7521-ignored-mode.sh
+11
-11
@@ -30,7 +30,7 @@ test_expect_success 'Verify behavior of status on directories with ignored files
30
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
31
32
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
33
- test_i18ncmp expect output
33
+ test_cmp expect output
34
'
35
36
test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
@@ -55,7 +55,7 @@ test_expect_success 'Verify status behavior on directory with tracked & ignored
55
git commit -m "commit tracked files" &&
56
57
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
58
- test_i18ncmp expect output
58
+ test_cmp expect output
59
'
60
61
test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
@@ -80,7 +80,7 @@ test_expect_success 'Verify status behavior on directory with untracked and igno
80
dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
81
82
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
83
- test_i18ncmp expect output
83
+ test_cmp expect output
84
'
85
86
test_expect_success 'Verify status matching ignored files on ignored directory' '
@@ -96,7 +96,7 @@ test_expect_success 'Verify status matching ignored files on ignored directory'
96
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
97
98
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
99
- test_i18ncmp expect output
99
+ test_cmp expect output
100
'
101
102
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -117,7 +117,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
117
git add -f ignored_dir/tracked &&
118
git commit -m "Force add file in ignored directory" &&
119
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
120
- test_i18ncmp expect output
120
+ test_cmp expect output
121
'
122
123
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -136,7 +136,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
136
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
137
untracked_dir/untracked &&
138
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
139
- test_i18ncmp expect output
139
+ test_cmp expect output
140
'
141
142
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -155,7 +155,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
155
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
156
untracked_dir/untracked &&
157
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
158
- test_i18ncmp expect output
158
+ test_cmp expect output
159
'
160
161
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -176,7 +176,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
176
git add -f ignored_dir/tracked &&
177
git commit -m "Force add file in ignored directory" &&
178
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
179
- test_i18ncmp expect output
179
+ test_cmp expect output
180
'
181
182
test_expect_success 'Verify behavior of status with --ignored=no' '
@@ -191,7 +191,7 @@ test_expect_success 'Verify behavior of status with --ignored=no' '
191
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
192
193
git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
194
- test_i18ncmp expect output
194
+ test_cmp expect output
195
'
196
197
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
@@ -210,7 +210,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
210
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
211
212
git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
213
- test_i18ncmp expect output
213
+ test_cmp expect output
214
'
215
216
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
@@ -227,7 +227,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
227
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
228
229
git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
230
- test_i18ncmp expect output
230
+ test_cmp expect output
231
'
232
233
test_done
t/t7600-merge.sh
+2
-2
@@ -272,7 +272,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
272
EOF
273
git cat-file commit HEAD >raw &&
274
sed -e "1,/^$/d" raw >actual &&
275
- test_i18ncmp expect actual
275
+ test_cmp expect actual
276
'
277
278
test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
@@ -296,7 +296,7 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
296
EOF
297
git cat-file commit HEAD >raw &&
298
sed -e "1,/^$/d" raw >actual &&
299
- test_i18ncmp expect actual
299
+ test_cmp expect actual
300
'
301
302
test_debug 'git log --graph --decorate --oneline --all'
t/t7602-merge-octopus-many.sh
+3
-3
@@ -66,7 +66,7 @@ EOF
66
test_expect_success 'merge output uses pretty names' '
67
git reset --hard c1 &&
68
git merge c2 c3 c4 >actual &&
69
- test_i18ncmp expected actual
69
+ test_cmp expected actual
70
'
71
72
cat >expected <<\EOF
@@ -84,7 +84,7 @@ test_expect_success 'merge reduces irrelevant remote heads' '
84
rm expected.tmp
85
fi &&
86
GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
87
- test_i18ncmp expected actual
87
+ test_cmp expected actual
88
'
89
90
cat >expected <<\EOF
@@ -101,7 +101,7 @@ EOF
101
test_expect_success 'merge fast-forward output uses pretty names' '
102
git reset --hard c0 &&
103
git merge c1 c2 >actual &&
104
- test_i18ncmp expected actual
104
+ test_cmp expected actual
105
'
106
107
test_done