undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-04-12 16:23:01 -07:00
parent f2c8c8007c
commit fff1bb3a34
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3203-branch-output.sh
View File

@ -72,10 +72,10 @@ cat >expect <<'EOF'
branch-two branch-two
master master
EOF 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 checkout HEAD^0 &&
git branch >actual && git branch >actual &&
test_cmp expect actual test_i18ncmp expect actual
' '
test_done test_done

4
t/t3501-revert-cherry-pick.sh
View File

@ -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 && echo content >extra_file &&
git add extra_file && git add extra_file &&
test_must_fail git revert HEAD 2>errors && 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
' '

4
t/t3507-cherry-pick-conflict.sh
View File

@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
test "$head" = "$newhead" 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 && pristine_detach initial &&
picked=\$(git rev-parse --short picked) && picked=\$(git rev-parse --short picked) &&
@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
EOF EOF
test_must_fail git cherry-pick picked 2>actual && 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' ' test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '