i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cc6658e7b4
commit
c9ea118e75
@ -495,10 +495,10 @@ test_expect_success 'merge fast-forward in a dirty tree' '
|
||||
|
||||
test_debug 'git log --graph --decorate --oneline --all'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
|
||||
test_expect_success 'in-index merge' '
|
||||
git reset --hard c0 &&
|
||||
git merge --no-ff -s resolve c1 >out &&
|
||||
grep "Wonderful." out &&
|
||||
test_i18ngrep "Wonderful." out &&
|
||||
verify_parents $c0 $c1
|
||||
'
|
||||
|
||||
|
@ -150,11 +150,8 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
|
||||
git rm -fr . &&
|
||||
git checkout --orphan new &&
|
||||
cp important c0.c &&
|
||||
test_must_fail git merge c0 2>out
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' '
|
||||
test_cmp out expect
|
||||
test_must_fail git merge c0 2>out &&
|
||||
test_i18ncmp out expect
|
||||
'
|
||||
|
||||
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
|
||||
|
@ -46,11 +46,8 @@ test_expect_success 'setup' '
|
||||
pre_merge_head="$(git rev-parse HEAD)"
|
||||
|
||||
test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '
|
||||
test_must_fail git merge --abort 2>output
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (unstarted merge): fatal output' '
|
||||
grep -q MERGE_HEAD output
|
||||
test_must_fail git merge --abort 2>output &&
|
||||
test_i18ngrep MERGE_HEAD output
|
||||
'
|
||||
|
||||
test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '
|
||||
@ -63,11 +60,8 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' '
|
||||
test ! -f .git/MERGE_HEAD &&
|
||||
# Merge successfully completed
|
||||
post_merge_head="$(git rev-parse HEAD)" &&
|
||||
test_must_fail git merge --abort 2>output
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (completed merge): output' '
|
||||
grep -q MERGE_HEAD output
|
||||
test_must_fail git merge --abort 2>output &&
|
||||
test_i18ngrep MERGE_HEAD output
|
||||
'
|
||||
|
||||
test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '
|
||||
|
@ -61,9 +61,9 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
|
||||
test_cmp empty out
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' '
|
||||
test_expect_success 'git grep -O --cached' '
|
||||
test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
|
||||
grep open-files-in-pager msg
|
||||
test_i18ngrep open-files-in-pager msg
|
||||
'
|
||||
|
||||
test_expect_success 'git grep -O --no-index' '
|
||||
|
Loading…
Reference in New Issue
Block a user