aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-10 13:42:48 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-10 13:42:48 -0800
commit216d2e0f3f9ab672077d0aa7aa20e6e9c2ac8ff3 (patch)
tree268bdfbb1957331373830aa4f0217748948d26aa
parent57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea (diff)
parent33f0ea42e12d3f54ef8ff53580649885c1503d05 (diff)
downloadgit-216d2e0f3f9ab672077d0aa7aa20e6e9c2ac8ff3.tar.gz
git-216d2e0f3f9ab672077d0aa7aa20e6e9c2ac8ff3.tar.xz
Merge branch 'maint-1.6.5' into maint
* maint-1.6.5: t8003: check exit code of command and error message separately
-rwxr-xr-xt/t8003-blame.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
index 4a8db74f7..3bbddd03c 100755
--- a/t/t8003-blame.sh
+++ b/t/t8003-blame.sh
@@ -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