From: Ed Maste <emaste@FreeBSD.org>
To: git@vger.kernel.org
Cc: peff@peff.net, lukasz@niemier.pl, Ed Maste <emaste@FreeBSD.org>
Subject: [PATCH v2] userdiff: remove empty subexpression from elixir regex
Date: Fri, 13 Dec 2019 17:55:35 +0000 [thread overview]
Message-ID: <20191213175535.87725-1-emaste@FreeBSD.org> (raw)
In-Reply-To: <20191213173902.71541-1-emaste@FreeBSD.org>
The regex failed to compile on FreeBSD.
Fixes: a807200f67588f6e
Signed-off-by: Ed Maste <emaste@FreeBSD.org>
---
Add /* -- */ to make things more clear and be consistent with other
patterns.
userdiff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/userdiff.c b/userdiff.c
index 324916f20f..efbe05e5a5 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -34,8 +34,9 @@ PATTERNS("dts",
"|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"),
PATTERNS("elixir",
"^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$",
+ /* -- */
/* Atoms, names, and module attributes */
- "|[@:]?[a-zA-Z0-9@_?!]+"
+ "[@:]?[a-zA-Z0-9@_?!]+"
/* Numbers with specific base */
"|[-+]?0[xob][0-9a-fA-F]+"
/* Numbers */
--
2.24.0
next prev parent reply other threads:[~2019-12-13 17:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 17:39 [PATCH] userdiff: remove empty subexpression from elixir regex Ed Maste
2019-12-13 17:45 ` Jeff King
2019-12-13 14:11 ` Ed Maste
2019-12-13 17:55 ` Ed Maste [this message]
2019-12-13 18:18 ` [PATCH v2] " Jeff King
2019-12-13 19:24 ` Johannes Sixt
2019-12-13 15:58 ` Ed Maste
2019-12-13 20:23 ` Junio C Hamano
2019-12-13 20:59 ` Numbers with specific base (was: [PATCH] userdiff: remove empty subexpression from elixir regex) Achim Gratz
2019-12-13 22:00 ` Numbers with specific base 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213175535.87725-1-emaste@FreeBSD.org \
--to=emaste@freebsd.org \
--cc=git@vger.kernel.org \
--cc=lukasz@niemier.pl \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).