From: drafnel@gmail.com Date: Thu, 16 Oct 2008 00:58:50 GMT Subject: [PATCH maint 2/2] t4018-diff-funcname: demonstrate end of line funcname matching flaw Message-ID: <6078773.1224118690194.JavaMail.teamon@b307.teamon.com> In-Reply-To: <1224118730-24711-1-git-send-email-drafnel@gmail.com> Since the newline is not removed from lines before pattern matching, a pattern cannot match to the end of the line using the '$' operator without using an additional operator which will indirectly match the '\n' character. Introduce a test which should pass, but which does not due to this flaw. Signed-off-by: Brandon Casey --- t/t4018-diff-funcname.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 72076ec..40a805a 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -69,6 +69,12 @@ test_expect_success 'last regexp must not be negated' ' grep "fatal: Last expression must not be negated:" ' +test_expect_failure 'pattern which matches to end of line' ' + git config diff.java.funcname "Beer$" && + git diff --no-index Beer.java Beer-correct.java | + grep "^@@.*@@ Beer" +' + test_expect_success 'alternation in pattern' ' git config diff.java.xfuncname "^[ ]*((public|static).*)$" && git diff --no-index Beer.java Beer-correct.java | -- 1.6.0.2.101.gb844