mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f2c8c8007c
commit
fff1bb3a34
|
@ -72,10 +72,10 @@ cat >expect <<'EOF'
|
|||
branch-two
|
||||
master
|
||||
EOF
|
||||
test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' '
|
||||
test_expect_success 'git branch shows detached HEAD properly' '
|
||||
git checkout HEAD^0 &&
|
||||
git branch >actual &&
|
||||
test_cmp expect actual
|
||||
test_i18ncmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
|
||||
test_expect_success 'revert forbidden on dirty working tree' '
|
||||
|
||||
echo content >extra_file &&
|
||||
git add extra_file &&
|
||||
test_must_fail git revert HEAD 2>errors &&
|
||||
grep "Your local changes would be overwritten by " errors
|
||||
test_i18ngrep "Your local changes would be overwritten by " errors
|
||||
|
||||
'
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
|
|||
test "$head" = "$newhead"
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
|
||||
test_expect_success 'advice from failed cherry-pick' "
|
||||
pristine_detach initial &&
|
||||
|
||||
picked=\$(git rev-parse --short picked) &&
|
||||
|
@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
|
|||
EOF
|
||||
test_must_fail git cherry-pick picked 2>actual &&
|
||||
|
||||
test_cmp expected actual
|
||||
test_i18ncmp expected actual
|
||||
"
|
||||
|
||||
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
|
||||
|
|
Loading…
Reference in a new issue