i18n: use test_i18ngrep in t7201
Some test were mistakenly disabled under GETTEXT_POISON as well, and they have been resurrected. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:39 UTC
69382976aafae713c72d40b80f8900699c35bc76
1 file changed
+7
-7
t/t7201-co.sh
+7
-7
@@ -223,12 +223,12 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
223
test_cmp two expect
224
'
225
226
-test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD (with advice declined)' '
226
+test_expect_success 'checkout to detach HEAD (with advice declined)' '
227
228
git config advice.detachedHead false &&
229
git checkout -f renamer && git clean -f &&
230
git checkout renamer^ 2>messages &&
231
- grep "HEAD is now at 7329388" messages &&
231
+ test_i18ngrep "HEAD is now at 7329388" messages &&
232
test 1 -eq $(wc -l <messages) &&
233
H=$(git rev-parse --verify HEAD) &&
234
M=$(git show-ref -s --verify refs/heads/master) &&
@@ -242,11 +242,11 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD (with advice declin
242
fi
243
'
244
245
-test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD' '
245
+test_expect_success 'checkout to detach HEAD' '
246
git config advice.detachedHead true &&
247
git checkout -f renamer && git clean -f &&
248
git checkout renamer^ 2>messages &&
249
- grep "HEAD is now at 7329388" messages &&
249
+ test_i18ngrep "HEAD is now at 7329388" messages &&
250
test 1 -lt $(wc -l <messages) &&
251
H=$(git rev-parse --verify HEAD) &&
252
M=$(git show-ref -s --verify refs/heads/master) &&
@@ -260,7 +260,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD' '
260
fi
261
'
262
263
-test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with branchname^' '
263
+test_expect_success 'checkout to detach HEAD with branchname^' '
264
265
git checkout -f master && git clean -f &&
266
git checkout renamer^ &&
@@ -276,7 +276,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with branchname^' '
276
fi
277
'
278
279
-test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with :/message' '
279
+test_expect_success 'checkout to detach HEAD with :/message' '
280
281
git checkout -f master && git clean -f &&
282
git checkout ":/Initial" &&
@@ -292,7 +292,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with :/message' '
292
fi
293
'
294
295
-test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with HEAD^0' '
295
+test_expect_success 'checkout to detach HEAD with HEAD^0' '
296
297
git checkout -f master && git clean -f &&
298
git checkout HEAD^0 &&