t4018-diff-funcname: rework negated last expression test
This test used the non-zero exit status of 'git diff' to indicate that a negated funcname pattern, when placed last, was correctly rejected. The problem with this is that 'git diff' always returns non-zero if it finds differences in the files it is comparing, and the files must contain differences in order to trigger the funcname pattern codepath. Instead of checking for non-zero exit status, make sure the expected error message is printed. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey committed
Oct 15, 2008 at 19:58 UTC
16b26725368f7b80711d9a631029fbb869646f9c
1 file changed
+2
-1
t/t4018-diff-funcname.sh
+2
-1
@@ -65,7 +65,8 @@ test_expect_success 'custom pattern' '
65
66
test_expect_success 'last regexp must not be negated' '
67
git config diff.java.funcname "!static" &&
68
- test_must_fail git diff --no-index Beer.java Beer-correct.java
68
+ git diff --no-index Beer.java Beer-correct.java 2>&1 |
69
+ grep "fatal: Last expression must not be negated:"
70
'
71
72
test_expect_success 'alternation in pattern' '