From: Hamza Mahfooz <someguy@effective-light•com>
To: Carlo Arenas <carenas@gmail•com>
Cc: "Junio C Hamano" <gitster@pobox•com>,
git@vger•kernel.org, avarab@gmail•com,
"René Scharfe" <l.s.r@web•de>,
"Andreas Schwab" <schwab@linux-m68k•org>
Subject: Re: [PATCH v2] grep: avoid setting UTF mode when dangerous with PCRE
Date: Thu, 18 Nov 2021 07:49:29 -0500 [thread overview]
Message-ID: <HAQR2R.KZGF0ERBQ2Z72@effective-light.com> (raw)
In-Reply-To: <CAPUEsphbA0Qrnt-MdxyYT2OMrnXnbi0tN5_YNqLypCqDqZyeWg@mail.gmail.com>
If none of the patches that are trying to fix our usage of PCRE2 are
ACKed.
It would be preferable (from my perspective) to revert only ae39ba431a
(grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data,
2021-10-15) and disable the feature (for the time being) if PCRE2 is
selected, like so:
diff --git a/pretty.c b/pretty.c
index 1af5b093ae..a53d008d1e 100644
--- a/pretty.c
+++ b/pretty.c
@@ -452,7 +452,7 @@ static void append_line_with_color(struct strbuf
*sb, struct grep_opt *opt,
buf = line;
eol = buf + linelen;
- if (!opt || !want_color(color) || opt->invert)
+ if (!opt || !want_color(color) || opt->invert || opt->pcre2)
goto end;
line_color = opt->colors[GREP_COLOR_SELECTED];
On Thu, Nov 18 2021 at 02:15:49 AM -0800, Carlo Arenas
<carenas@gmail•com> wrote:
>
> This will likely need at least some ACKs.
>
> Apologies for the noise.
>
> Carlo
next prev parent reply other threads:[~2021-11-18 12:51 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 16:13 [PATCH v13 1/3] grep: refactor next_match() and match_one_pattern() for external use Hamza Mahfooz
2021-10-15 16:13 ` [PATCH v13 2/3] pretty: colorize pattern matches in commit messages Hamza Mahfooz
2021-10-15 16:13 ` [PATCH v13 3/3] grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data Hamza Mahfooz
2021-10-15 20:03 ` Junio C Hamano
2021-10-16 16:25 ` René Scharfe
2021-10-16 17:12 ` Ævar Arnfjörð Bjarmason
2021-10-16 19:44 ` René Scharfe
2021-10-17 6:00 ` Junio C Hamano
2021-10-17 6:55 ` René Scharfe
2021-10-17 9:44 ` Ævar Arnfjörð Bjarmason
2021-11-15 20:43 ` Andreas Schwab
2021-11-15 22:41 ` Ævar Arnfjörð Bjarmason
2021-11-16 2:12 ` Carlo Arenas
2021-11-16 8:41 ` Andreas Schwab
2021-11-16 9:06 ` Carlo Arenas
2021-11-16 9:18 ` Andreas Schwab
2021-11-16 9:29 ` Andreas Schwab
2021-11-16 9:38 ` Carlo Arenas
2021-11-16 9:55 ` Andreas Schwab
2021-11-16 11:00 ` [PATCH] grep: avoid setting UTF mode when not needed Carlo Marcelo Arenas Belón
2021-11-16 12:32 ` Ævar Arnfjörð Bjarmason
2021-11-16 13:35 ` Hamza Mahfooz
2021-11-17 14:31 ` Ævar Arnfjörð Bjarmason
2021-11-16 18:22 ` Carlo Arenas
2021-11-16 18:48 ` Junio C Hamano
2021-11-17 10:23 ` [PATCH v2] grep: avoid setting UTF mode when dangerous with PCRE Carlo Marcelo Arenas Belón
2021-11-18 7:29 ` Junio C Hamano
2021-11-18 10:15 ` Carlo Arenas
2021-11-18 12:49 ` Hamza Mahfooz [this message]
2021-11-19 6:58 ` Ævar Arnfjörð Bjarmason
2021-11-18 21:21 ` Hamza Mahfooz
2021-11-17 18:46 ` [PATCH v13 3/3] grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data René Scharfe
2021-11-17 19:56 ` Carlo Arenas
2021-11-17 20:59 ` Ævar Arnfjörð Bjarmason
2021-11-17 21:53 ` Carlo Arenas
2021-11-18 0:00 ` Ævar Arnfjörð Bjarmason
2021-11-18 18:17 ` Junio C Hamano
2021-11-18 20:57 ` René Scharfe
2021-11-19 7:00 ` Ævar Arnfjörð Bjarmason
2021-11-19 16:08 ` René Scharfe
2021-11-19 17:33 ` Carlo Arenas
2021-11-19 17:11 ` Junio C Hamano
2021-10-15 18:05 ` [PATCH v13 1/3] grep: refactor next_match() and match_one_pattern() for external use Junio C Hamano
2021-10-15 18:24 ` Hamza Mahfooz
2021-10-15 19:28 ` Junio C Hamano
2021-10-15 19:40 ` Hamza Mahfooz
2021-10-15 19:49 ` 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=HAQR2R.KZGF0ERBQ2Z72@effective-light.com \
--to=someguy@effective-light$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=l.s.r@web$(echo .)de \
--cc=schwab@linux-m68k$(echo .)org \
/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