i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:23 UTC
fff1bb3a349687e262ba4fcf5f333af07be9d149
3 files changed
+6
-6
t/t3203-branch-output.sh
+2
-2
@@ -72,10 +72,10 @@ cat >expect <<'EOF'
72
branch-two
73
master
74
EOF
75
-test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' '
75
+test_expect_success 'git branch shows detached HEAD properly' '
76
git checkout HEAD^0 &&
77
git branch >actual &&
78
- test_cmp expect actual
78
+ test_i18ncmp expect actual
79
'
80
81
test_done
t/t3501-revert-cherry-pick.sh
+2
-2
@@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' '
91
)
92
'
93
94
-test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
94
+test_expect_success 'revert forbidden on dirty working tree' '
95
96
echo content >extra_file &&
97
git add extra_file &&
98
test_must_fail git revert HEAD 2>errors &&
99
- grep "Your local changes would be overwritten by " errors
99
+ test_i18ngrep "Your local changes would be overwritten by " errors
100
101
'
102
t/t3507-cherry-pick-conflict.sh
+2
-2
@@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
44
test "$head" = "$newhead"
45
'
46
47
-test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
47
+test_expect_success 'advice from failed cherry-pick' "
48
pristine_detach initial &&
49
50
picked=\$(git rev-parse --short picked) &&
@@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
56
EOF
57
test_must_fail git cherry-pick picked 2>actual &&
58
59
- test_cmp expected actual
59
+ test_i18ncmp expected actual
60
"
61
62
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '