public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: drafnel@gmail•com
To: gitster@pobox•com
Cc: git@vger•kernel.org, Brandon Casey <drafnel@gmail•com>
Subject: [PATCH maint 2/2] t4018-diff-funcname: demonstrate end of line funcname matching flaw
Date: Wed, 15 Oct 2008 19:58:50 -0500	[thread overview]
Message-ID: <6078773.1224118690194.JavaMail.teamon@b307.teamon.com> (raw)
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 <drafnel@gmail•com>
---
 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

  parent reply	other threads:[~2008-10-16  1:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14 22:08 What's in git.git (Oct 2008, #03; Tue, 14) Junio C Hamano
2008-10-15 15:35 ` Brandon Casey
2008-10-15 17:25   ` Mike Ralphson
2008-10-15 19:38   ` Junio C Hamano
2008-10-15 20:20     ` Shawn O. Pearce
2008-10-15 20:26       ` Junio C Hamano
2008-10-15 20:36         ` Shawn O. Pearce
2008-10-16  0:58     ` [PATCH maint 1/2] t4018-diff-funcname: rework negated last expression test drafnel
     [not found]     ` <1224118730-24711-1-git-send-email-drafnel@gmail.com>
2008-10-16  0:58       ` drafnel [this message]
2008-10-16 10:08   ` What's in git.git (Oct 2008, #03; Tue, 14) Jeff King
2008-10-16 15:21     ` Brandon Casey
2008-10-16 15:37       ` Pieter de Bie
2008-10-17  7:02         ` Arjen Laarhoven
2008-10-24  2:44   ` Junio C Hamano
2008-10-17  9:53 ` Jeff King
2008-10-17 23:58   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6078773.1224118690194.JavaMail.teamon@b307.teamon.com \
    --to=drafnel@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox