Skip to content

Commit 7a23d2d

Browse files
committed
i18n: use test_i18ngrep in t7506
Signed-off-by: Junio C Hamano <[email protected]>
1 parent f79ce8d commit 7a23d2d

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

t/t7506-status-submodule.sh

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ test_expect_success 'setup' '
2020
git commit -m "Add submodule sub"
2121
'
2222

23-
test_expect_success C_LOCALE_OUTPUT 'status clean' '
23+
test_expect_success 'status clean' '
2424
git status >output &&
25-
grep "nothing to commit" output
25+
test_i18ngrep "nothing to commit" output
2626
'
2727

28-
test_expect_success C_LOCALE_OUTPUT 'commit --dry-run -a clean' '
28+
test_expect_success 'commit --dry-run -a clean' '
2929
test_must_fail git commit --dry-run -a >output &&
30-
grep "nothing to commit" output
30+
test_i18ngrep "nothing to commit" output
3131
'
3232

33-
test_expect_success C_LOCALE_OUTPUT 'status with modified file in submodule' '
33+
test_expect_success 'status with modified file in submodule' '
3434
(cd sub && git reset --hard) &&
3535
echo "changed" >sub/foo &&
3636
git status >output &&
37-
grep "modified: sub (modified content)" output
37+
test_i18ngrep "modified: sub (modified content)" output
3838
'
3939

4040
test_expect_success 'status with modified file in submodule (porcelain)' '
@@ -46,10 +46,10 @@ test_expect_success 'status with modified file in submodule (porcelain)' '
4646
EOF
4747
'
4848

49-
test_expect_success C_LOCALE_OUTPUT 'status with added file in submodule' '
49+
test_expect_success 'status with added file in submodule' '
5050
(cd sub && git reset --hard && echo >foo && git add foo) &&
5151
git status >output &&
52-
grep "modified: sub (modified content)" output
52+
test_i18ngrep "modified: sub (modified content)" output
5353
'
5454

5555
test_expect_success 'status with added file in submodule (porcelain)' '
@@ -60,16 +60,16 @@ test_expect_success 'status with added file in submodule (porcelain)' '
6060
EOF
6161
'
6262

63-
test_expect_success C_LOCALE_OUTPUT 'status with untracked file in submodule' '
63+
test_expect_success 'status with untracked file in submodule' '
6464
(cd sub && git reset --hard) &&
6565
echo "content" >sub/new-file &&
6666
git status >output &&
67-
grep "modified: sub (untracked content)" output
67+
test_i18ngrep "modified: sub (untracked content)" output
6868
'
6969

70-
test_expect_success C_LOCALE_OUTPUT 'status -uno with untracked file in submodule' '
70+
test_expect_success 'status -uno with untracked file in submodule' '
7171
git status -uno >output &&
72-
grep "^nothing to commit" output
72+
test_i18ngrep "^nothing to commit" output
7373
'
7474

7575
test_expect_success 'status with untracked file in submodule (porcelain)' '
@@ -79,11 +79,11 @@ test_expect_success 'status with untracked file in submodule (porcelain)' '
7979
EOF
8080
'
8181

82-
test_expect_success C_LOCALE_OUTPUT 'status with added and untracked file in submodule' '
82+
test_expect_success 'status with added and untracked file in submodule' '
8383
(cd sub && git reset --hard && echo >foo && git add foo) &&
8484
echo "content" >sub/new-file &&
8585
git status >output &&
86-
grep "modified: sub (modified content, untracked content)" output
86+
test_i18ngrep "modified: sub (modified content, untracked content)" output
8787
'
8888

8989
test_expect_success 'status with added and untracked file in submodule (porcelain)' '
@@ -95,13 +95,13 @@ test_expect_success 'status with added and untracked file in submodule (porcelai
9595
EOF
9696
'
9797

98-
test_expect_success C_LOCALE_OUTPUT 'status with modified file in modified submodule' '
98+
test_expect_success 'status with modified file in modified submodule' '
9999
(cd sub && git reset --hard) &&
100100
rm sub/new-file &&
101101
(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
102102
echo "changed" >sub/foo &&
103103
git status >output &&
104-
grep "modified: sub (new commits, modified content)" output
104+
test_i18ngrep "modified: sub (new commits, modified content)" output
105105
'
106106

107107
test_expect_success 'status with modified file in modified submodule (porcelain)' '
@@ -113,10 +113,10 @@ test_expect_success 'status with modified file in modified submodule (porcelain)
113113
EOF
114114
'
115115

116-
test_expect_success C_LOCALE_OUTPUT 'status with added file in modified submodule' '
116+
test_expect_success 'status with added file in modified submodule' '
117117
(cd sub && git reset --hard && echo >foo && git add foo) &&
118118
git status >output &&
119-
grep "modified: sub (new commits, modified content)" output
119+
test_i18ngrep "modified: sub (new commits, modified content)" output
120120
'
121121

122122
test_expect_success 'status with added file in modified submodule (porcelain)' '
@@ -127,11 +127,11 @@ test_expect_success 'status with added file in modified submodule (porcelain)' '
127127
EOF
128128
'
129129

130-
test_expect_success C_LOCALE_OUTPUT 'status with untracked file in modified submodule' '
130+
test_expect_success 'status with untracked file in modified submodule' '
131131
(cd sub && git reset --hard) &&
132132
echo "content" >sub/new-file &&
133133
git status >output &&
134-
grep "modified: sub (new commits, untracked content)" output
134+
test_i18ngrep "modified: sub (new commits, untracked content)" output
135135
'
136136

137137
test_expect_success 'status with untracked file in modified submodule (porcelain)' '
@@ -141,11 +141,11 @@ test_expect_success 'status with untracked file in modified submodule (porcelain
141141
EOF
142142
'
143143

144-
test_expect_success C_LOCALE_OUTPUT 'status with added and untracked file in modified submodule' '
144+
test_expect_success 'status with added and untracked file in modified submodule' '
145145
(cd sub && git reset --hard && echo >foo && git add foo) &&
146146
echo "content" >sub/new-file &&
147147
git status >output &&
148-
grep "modified: sub (new commits, modified content, untracked content)" output
148+
test_i18ngrep "modified: sub (new commits, modified content, untracked content)" output
149149
'
150150

151151
test_expect_success 'status with added and untracked file in modified submodule (porcelain)' '
@@ -167,24 +167,24 @@ test_expect_success 'setup .git file for sub' '
167167
git commit -m "added .real to .gitignore" .gitignore
168168
'
169169

170-
test_expect_success C_LOCALE_OUTPUT 'status with added file in modified submodule with .git file' '
170+
test_expect_success 'status with added file in modified submodule with .git file' '
171171
(cd sub && git reset --hard && echo >foo && git add foo) &&
172172
git status >output &&
173-
grep "modified: sub (new commits, modified content)" output
173+
test_i18ngrep "modified: sub (new commits, modified content)" output
174174
'
175175

176176
test_expect_success 'rm submodule contents' '
177177
rm -rf sub/* sub/.git
178178
'
179179

180-
test_expect_success C_LOCALE_OUTPUT 'status clean (empty submodule dir)' '
180+
test_expect_success 'status clean (empty submodule dir)' '
181181
git status >output &&
182-
grep "nothing to commit" output
182+
test_i18ngrep "nothing to commit" output
183183
'
184184

185-
test_expect_success C_LOCALE_OUTPUT 'status -a clean (empty submodule dir)' '
185+
test_expect_success 'status -a clean (empty submodule dir)' '
186186
test_must_fail git commit --dry-run -a >output &&
187-
grep "nothing to commit" output
187+
test_i18ngrep "nothing to commit" output
188188
'
189189

190190
test_done

0 commit comments

Comments
 (0)