From: Brandon Casey Date: Thu, 16 Oct 2008 00:58:49 +0000 (-0500) Subject: t4018-diff-funcname: rework negated last expression test X-Git-Tag: v1.6.0.3~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16b26725368f7b80711d9a631029fbb869646f9c;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 99fff973e..72076eca8 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -65,7 +65,8 @@ test_expect_success 'custom pattern' ' test_expect_success 'last regexp must not be negated' ' git config diff.java.funcname "!static" && - test_must_fail git diff --no-index Beer.java Beer-correct.java + git diff --no-index Beer.java Beer-correct.java 2>&1 | + grep "fatal: Last expression must not be negated:" ' test_expect_success 'alternation in pattern' '