summaryrefslogtreecommitdiff
path: root/t/t4018-diff-funcname.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-17 08:52:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-17 08:52:32 (GMT)
commit46dc1b0e332612aa32c139007fa33f4b429de9d1 (patch)
tree86e934ac60e69c03c44a9d59eab6e400c16efb5f /t/t4018-diff-funcname.sh
parent84ed4c5d117d72f02cc918e413b9861a9d2846d7 (diff)
parent8ed0a740dd42bd0724aebed6e3b07c4ea2a2d5e8 (diff)
downloadgit-46dc1b0e332612aa32c139007fa33f4b429de9d1.zip
git-46dc1b0e332612aa32c139007fa33f4b429de9d1.tar.gz
git-46dc1b0e332612aa32c139007fa33f4b429de9d1.tar.bz2
Merge branch 'maint'
* maint: t1301-shared-repo.sh: don't let a default ACL interfere with the test git-check-attr(1): add output and example sections xdiff-interface.c: strip newline (and cr) from line before pattern matching t4018-diff-funcname: demonstrate end of line funcname matching flaw t4018-diff-funcname: rework negated last expression test Typo "does not exists" when git remote update remote. remote.c: correct the check for a leading '/' in a remote name Add testcase to ensure merging an early part of a branch is done properly Conflicts: t/t7600-merge.sh
Diffstat (limited to 't/t4018-diff-funcname.sh')
-rwxr-xr-xt/t4018-diff-funcname.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 0320e19..be54134 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -65,7 +65,14 @@ 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 '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' '