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

Fix tests under GETTEXT_POISON on git-remote

Browse Source 
Use the i18n-specific test functions in test scripts for git-remote.
This issue was was introduced in v1.7.10-233-gbb16d5:

    bb16d5 i18n: remote: mark strings for translation

and been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin 2012-08-27 13:36:54 +08:00 committed by Junio C Hamano
parent 9aa98efca2
commit f7dc6a9643
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
t/t5505-remote.sh
View File

@ -52,7 +52,7 @@ test_expect_success setup '
' '
test_expect_success 'remote information for the origin' ' test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
( (
cd test && cd test &&
tokens_match origin "$(git remote)" && tokens_match origin "$(git remote)" &&
@ -66,8 +66,6 @@ test_expect_success 'add another remote' '
cd test && cd test &&
git remote add -f second ../two && git remote add -f second ../two &&
tokens_match "origin second" "$(git remote)" && tokens_match "origin second" "$(git remote)" &&
check_remote_track origin master side &&
check_remote_track second master side another &&
check_tracking_branch second master side another && check_tracking_branch second master side another &&
git for-each-ref "--format=%(refname)" refs/remotes | git for-each-ref "--format=%(refname)" refs/remotes |
sed -e "/^refs\/remotes\/origin\//d" \ sed -e "/^refs\/remotes\/origin\//d" \
@ -77,6 +75,14 @@ test_expect_success 'add another remote' '
) )
' '
test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
(
cd test &&
check_remote_track origin master side &&
check_remote_track second master side another
)
'
test_expect_success 'remote forces tracking branches' ' test_expect_success 'remote forces tracking branches' '
( (
cd test && cd test &&
@ -95,7 +101,7 @@ test_expect_success 'remove remote' '
) )
' '
test_expect_success 'remove remote' ' test_expect_success C_LOCALE_OUTPUT 'remove remote' '
( (
cd test && cd test &&
tokens_match origin "$(git remote)" && tokens_match origin "$(git remote)" &&
@ -131,8 +137,8 @@ EOF
git remote rm oops 2>actual2 && git remote rm oops 2>actual2 &&
git branch -d foobranch && git branch -d foobranch &&
git tag -d footag && git tag -d footag &&
test_cmp expect1 actual1 && test_i18ncmp expect1 actual1 &&
test_cmp expect2 actual2 test_i18ncmp expect2 actual2
) )
' '
@ -192,7 +198,7 @@ test_expect_success 'show' '
git config --add remote.two.push refs/heads/master:refs/heads/another && git config --add remote.two.push refs/heads/master:refs/heads/another &&
git remote show origin two > output && git remote show origin two > output &&
git branch -d rebase octopus && git branch -d rebase octopus &&
test_cmp expect output) test_i18ncmp expect output)
' '
cat > test/expect << EOF cat > test/expect << EOF
@ -217,7 +223,7 @@ test_expect_success 'show -n' '
cd test && cd test &&
git remote show -n origin > output && git remote show -n origin > output &&
mv ../one.unreachable ../one && mv ../one.unreachable ../one &&
test_cmp expect output) test_i18ncmp expect output)
' '
test_expect_success 'prune' ' test_expect_success 'prune' '
@ -255,7 +261,7 @@ EOF
test_expect_success 'set-head --auto fails w/multiple HEADs' ' test_expect_success 'set-head --auto fails w/multiple HEADs' '
(cd test && (cd test &&
test_must_fail git remote set-head --auto two >output 2>&1 && test_must_fail git remote set-head --auto two >output 2>&1 &&
test_cmp expect output) test_i18ncmp expect output)
' '
cat >test/expect <<EOF cat >test/expect <<EOF
@ -285,7 +291,7 @@ test_expect_success 'prune --dry-run' '
test_must_fail git rev-parse refs/remotes/origin/side && test_must_fail git rev-parse refs/remotes/origin/side &&
(cd ../one && (cd ../one &&
git branch -m side side2) && git branch -m side side2) &&
test_cmp expect output) test_i18ncmp expect output)
' '
test_expect_success 'add --mirror && prune' ' test_expect_success 'add --mirror && prune' '
@ -705,7 +711,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
cd seven && cd seven &&
git remote prune origin git remote prune origin
) >err 2>&1 && ) >err 2>&1 &&
grep "has become dangling" err && test_i18ngrep "has become dangling" err &&
: And the dangling symref will not cause other annoying errors && : And the dangling symref will not cause other annoying errors &&
( (