Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
t8003: check exit code of command and error message separately

diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
index 4a8db74f7e09a143e73d647479ef62af91547865..3bbddd03cbfcf5cbdff6ed2987d68da9402ed993 100755 (executable)
--- 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