mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
476cca692c
commit
69382976aa
|
@ -223,12 +223,12 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
|
|||
test_cmp two expect
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD (with advice declined)' '
|
||||
test_expect_success 'checkout to detach HEAD (with advice declined)' '
|
||||
|
||||
git config advice.detachedHead false &&
|
||||
git checkout -f renamer && git clean -f &&
|
||||
git checkout renamer^ 2>messages &&
|
||||
grep "HEAD is now at 7329388" messages &&
|
||||
test_i18ngrep "HEAD is now at 7329388" messages &&
|
||||
test 1 -eq $(wc -l <messages) &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
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
|
|||
fi
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD' '
|
||||
test_expect_success 'checkout to detach HEAD' '
|
||||
git config advice.detachedHead true &&
|
||||
git checkout -f renamer && git clean -f &&
|
||||
git checkout renamer^ 2>messages &&
|
||||
grep "HEAD is now at 7329388" messages &&
|
||||
test_i18ngrep "HEAD is now at 7329388" messages &&
|
||||
test 1 -lt $(wc -l <messages) &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
M=$(git show-ref -s --verify refs/heads/master) &&
|
||||
|
@ -260,7 +260,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD' '
|
|||
fi
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with branchname^' '
|
||||
test_expect_success 'checkout to detach HEAD with branchname^' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout renamer^ &&
|
||||
|
@ -276,7 +276,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with branchname^' '
|
|||
fi
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with :/message' '
|
||||
test_expect_success 'checkout to detach HEAD with :/message' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout ":/Initial" &&
|
||||
|
@ -292,7 +292,7 @@ test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with :/message' '
|
|||
fi
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'checkout to detach HEAD with HEAD^0' '
|
||||
test_expect_success 'checkout to detach HEAD with HEAD^0' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout HEAD^0 &&
|
||||
|
|
Loading…
Reference in a new issue