Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
  t8003: check exit code of command and error message separately
This commit is contained in:
Junio C Hamano 2010-02-10 13:42:48 -08:00
commit 216d2e0f3f

View file

@ -158,11 +158,13 @@ EOF
'
test_expect_success 'blame -L with invalid start' '
test_must_fail git blame -L5 tres 2>&1 | grep "has only 2 lines"
test_must_fail git blame -L5 tres 2>errors &&
grep "has only 2 lines" errors
'
test_expect_success 'blame -L with invalid end' '
git blame -L1,5 tres 2>&1 | grep "has only 2 lines"
test_must_fail git blame -L1,5 tres 2>errors &&
grep "has only 2 lines" errors
'
test_done