i18n: use test_i18ngrep in t7506
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 14, 2011 at 13:37 UTC
7a23d2d28a1fcdb9e52101eacaa87af02a148b21
1 file changed
+28
-28
t/t7506-status-submodule.sh
+28
-28
@@ -20,21 +20,21 @@ test_expect_success 'setup' '
20
git commit -m "Add submodule sub"
21
'
22
23
-test_expect_success C_LOCALE_OUTPUT 'status clean' '
23
+test_expect_success 'status clean' '
24
git status >output &&
25
- grep "nothing to commit" output
25
+ test_i18ngrep "nothing to commit" output
26
'
27
28
-test_expect_success C_LOCALE_OUTPUT 'commit --dry-run -a clean' '
28
+test_expect_success 'commit --dry-run -a clean' '
29
test_must_fail git commit --dry-run -a >output &&
30
- grep "nothing to commit" output
30
+ test_i18ngrep "nothing to commit" output
31
'
32
33
-test_expect_success C_LOCALE_OUTPUT 'status with modified file in submodule' '
33
+test_expect_success 'status with modified file in submodule' '
34
(cd sub && git reset --hard) &&
35
echo "changed" >sub/foo &&
36
git status >output &&
37
- grep "modified: sub (modified content)" output
37
+ test_i18ngrep "modified: sub (modified content)" output
38
'
39
40
test_expect_success 'status with modified file in submodule (porcelain)' '
@@ -46,10 +46,10 @@ test_expect_success 'status with modified file in submodule (porcelain)' '
46
EOF
47
'
48
49
-test_expect_success C_LOCALE_OUTPUT 'status with added file in submodule' '
49
+test_expect_success 'status with added file in submodule' '
50
(cd sub && git reset --hard && echo >foo && git add foo) &&
51
git status >output &&
52
- grep "modified: sub (modified content)" output
52
+ test_i18ngrep "modified: sub (modified content)" output
53
'
54
55
test_expect_success 'status with added file in submodule (porcelain)' '
@@ -60,16 +60,16 @@ test_expect_success 'status with added file in submodule (porcelain)' '
60
EOF
61
'
62
63
-test_expect_success C_LOCALE_OUTPUT 'status with untracked file in submodule' '
63
+test_expect_success 'status with untracked file in submodule' '
64
(cd sub && git reset --hard) &&
65
echo "content" >sub/new-file &&
66
git status >output &&
67
- grep "modified: sub (untracked content)" output
67
+ test_i18ngrep "modified: sub (untracked content)" output
68
'
69
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' '
71
git status -uno >output &&
72
- grep "^nothing to commit" output
72
+ test_i18ngrep "^nothing to commit" output
73
'
74
75
test_expect_success 'status with untracked file in submodule (porcelain)' '
@@ -79,11 +79,11 @@ test_expect_success 'status with untracked file in submodule (porcelain)' '
79
EOF
80
'
81
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' '
83
(cd sub && git reset --hard && echo >foo && git add foo) &&
84
echo "content" >sub/new-file &&
85
git status >output &&
86
- grep "modified: sub (modified content, untracked content)" output
86
+ test_i18ngrep "modified: sub (modified content, untracked content)" output
87
'
88
89
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
95
EOF
96
'
97
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' '
99
(cd sub && git reset --hard) &&
100
rm sub/new-file &&
101
(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
102
echo "changed" >sub/foo &&
103
git status >output &&
104
- grep "modified: sub (new commits, modified content)" output
104
+ test_i18ngrep "modified: sub (new commits, modified content)" output
105
'
106
107
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)
113
EOF
114
'
115
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' '
117
(cd sub && git reset --hard && echo >foo && git add foo) &&
118
git status >output &&
119
- grep "modified: sub (new commits, modified content)" output
119
+ test_i18ngrep "modified: sub (new commits, modified content)" output
120
'
121
122
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)' '
127
EOF
128
'
129
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' '
131
(cd sub && git reset --hard) &&
132
echo "content" >sub/new-file &&
133
git status >output &&
134
- grep "modified: sub (new commits, untracked content)" output
134
+ test_i18ngrep "modified: sub (new commits, untracked content)" output
135
'
136
137
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
141
EOF
142
'
143
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' '
145
(cd sub && git reset --hard && echo >foo && git add foo) &&
146
echo "content" >sub/new-file &&
147
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
149
'
150
151
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' '
167
git commit -m "added .real to .gitignore" .gitignore
168
'
169
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' '
171
(cd sub && git reset --hard && echo >foo && git add foo) &&
172
git status >output &&
173
- grep "modified: sub (new commits, modified content)" output
173
+ test_i18ngrep "modified: sub (new commits, modified content)" output
174
'
175
176
test_expect_success 'rm submodule contents' '
177
rm -rf sub/* sub/.git
178
'
179
180
-test_expect_success C_LOCALE_OUTPUT 'status clean (empty submodule dir)' '
180
+test_expect_success 'status clean (empty submodule dir)' '
181
git status >output &&
182
- grep "nothing to commit" output
182
+ test_i18ngrep "nothing to commit" output
183
'
184
185
-test_expect_success C_LOCALE_OUTPUT 'status -a clean (empty submodule dir)' '
185
+test_expect_success 'status -a clean (empty submodule dir)' '
186
test_must_fail git commit --dry-run -a >output &&
187
- grep "nothing to commit" output
187
+ test_i18ngrep "nothing to commit" output
188
'
189
190
test_done