test: do not rely on US English tracking-info messages

When v1.7.9.2~28^2 (2012-02-02) marked "Your branch is behind" and
friends for translation, it forgot to adjust tests not to check those
messages when tests are being run with git configured to write its
output in another language.

With this patch applied, t2020 and t6040 pass again with
GETTEXT_POISON=YesPlease.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Explained-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 068fba4c8e8706aa615d0401da1da47901113156..b37ce25c42cd2fb0e2868c19f66902b319526de2 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -148,7 +148,7 @@ test_expect_success 'tracking count is accurate after orphan check' '
        git config branch.child.merge refs/heads/master &&
        git checkout child^ &&
        git checkout child >stdout &&
        git config branch.child.merge refs/heads/master &&
        git checkout child^ &&
        git checkout child >stdout &&

-       test_cmp expect stdout
+       test_i18ncmp expect stdout

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 19272bc551277903bc1c444f4f0f05d8f2d7d672..ec2b516c3f79901ca5593f1edb97455e3fa8389e 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -71,13 +71,13 @@ test_expect_success 'checkout' '
        (
                cd test && git checkout b1
        ) >actual &&
        (
                cd test && git checkout b1
        ) >actual &&

-       grep "have 1 and 1 different" actual
+       test_i18ngrep "have 1 and 1 different" actual

 '
 
 test_expect_success 'checkout with local tracked branch' '
        git checkout master &&
        git checkout follower >actual &&
 '
 
 test_expect_success 'checkout with local tracked branch' '
        git checkout master &&
        git checkout follower >actual &&

-       grep "is ahead of" actual
+       test_i18ngrep "is ahead of" actual

 '
 
 test_expect_success 'status' '
 '
 
 test_expect_success 'status' '


@@ -87,14 +87,14 @@ test_expect_success 'status' '
                # reports nothing to commit
                test_must_fail git commit --dry-run
        ) >actual &&
                # reports nothing to commit
                test_must_fail git commit --dry-run
        ) >actual &&

-       grep "have 1 and 1 different" actual
+       test_i18ngrep "have 1 and 1 different" actual

 '
 
 test_expect_success 'fail to track lightweight tags' '
        git checkout master &&
        git tag light &&
        test_must_fail git branch --track lighttrack light >actual &&
 '
 
 test_expect_success 'fail to track lightweight tags' '
        git checkout master &&
        git tag light &&
        test_must_fail git branch --track lighttrack light >actual &&

-       test_must_fail grep "set up to track" actual &&
+       test_i18ngrep ! "set up to track" actual &&

        test_must_fail git checkout lighttrack
 '
 
        test_must_fail git checkout lighttrack
 '
 


@@ -102,7 +102,7 @@ test_expect_success 'fail to track annotated tags' '
        git checkout master &&
        git tag -m heavy heavy &&
        test_must_fail git branch --track heavytrack heavy >actual &&
        git checkout master &&
        git tag -m heavy heavy &&
        test_must_fail git branch --track heavytrack heavy >actual &&

-       test_must_fail grep "set up to track" actual &&
+       test_i18ngrep ! "set up to track" actual &&

        test_must_fail git checkout heavytrack
 '
 
        test_must_fail git checkout heavytrack
 '