mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity

Merge branch 'jn/more-i18ncmp'

Browse source 
By Jonathan Nieder
* jn/more-i18ncmp:
  test: am of empty patch should not succeed
  test: use test_i18ncmp for "Patch format detection failed" message
  test: do not rely on US English tracking-info messages
This commit is contained in:
Junio C Hamano 2012-04-23 13:01:28 -07:00
commit eb9756bd35
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t2020-checkout-detach.sh
View file

@ -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 &&
test_cmp expect stdout
test_i18ncmp expect stdout
'
test_done

4
t/t4150-am.sh
View file

@ -525,9 +525,9 @@ test_expect_success 'am empty-file does not infloop' '
git reset --hard &&
touch empty-file &&
test_tick &&
{ git am empty-file > actual 2>&1 && false || :; } &&
test_must_fail git am empty-file 2>actual &&
echo Patch format detection failed. >expected &&
test_cmp expected actual
test_i18ncmp expected actual
'
test_done

10
t/t6040-tracking-info.sh
View file

@ -71,13 +71,13 @@ test_expect_success 'checkout' '
(
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 &&
grep "is ahead of" actual
test_i18ngrep "is ahead of" actual
'
test_expect_success 'status' '
@ -87,14 +87,14 @@ test_expect_success 'status' '
# 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_must_fail grep "set up to track" actual &&
test_i18ngrep ! "set up to track" actual &&
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 &&
test_must_fail grep "set up to track" actual &&
test_i18ngrep ! "set up to track" actual &&
test_must_fail git checkout heavytrack
'