From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Dominic Winkler via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Dominic Winkler <d.winkler@flexarts.at>
Subject: Re: [PATCH v2 1/1] contrib/hooks: escape left brace in regex in the paranoid update hook
Date: Thu, 12 Sep 2019 10:56:46 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1909121055580.47@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <0d762cfb503fef081af9aa3cb0fe373863237745.1568238440.git.gitgitgadget@gmail.com>
Hi Dominic,
On Wed, 11 Sep 2019, Dominic Winkler via GitGitGadget wrote:
> From: Dominic Winkler <d.winkler@flexarts.at>
>
> A literal "{" should now be escaped in a pattern starting from perl
> versions >= v5.26. In perl v5.22, using a literal { in a regular
> expression was deprecated, and will emit a warning if it isn't escaped: \{.
> In v5.26, this won't just warn, it'll cause a syntax error.
>
> (see https://metacpan.org/pod/release/RJBS/perl-5.22.0/pod/perldelta.pod)
>
> Signed-off-by: Dominic Winkler <d.winkler@flexarts.at>
Thank you for addressing my concern so promptly. I am far from a Perl
expert, so take this with a train of salt: the patch now looks good to
me!
Ciao,
Johannes
> ---
> contrib/hooks/update-paranoid | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/hooks/update-paranoid b/contrib/hooks/update-paranoid
> index d18b317b2f..fc0a242a4e 100755
> --- a/contrib/hooks/update-paranoid
> +++ b/contrib/hooks/update-paranoid
> @@ -302,13 +302,13 @@ $op = 'U' if ($op eq 'R'
>
> RULE:
> foreach (@$rules) {
> - while (/\${user\.([a-z][a-zA-Z0-9]+)}/) {
> + while (/\$\{user\.([a-z][a-zA-Z0-9]+)}/) {
> my $k = lc $1;
> my $v = $data{"user.$k"};
> next RULE unless defined $v;
> next RULE if @$v != 1;
> next RULE unless defined $v->[0];
> - s/\${user\.$k}/$v->[0]/g;
> + s/\$\{user\.$k}/$v->[0]/g;
> }
>
> if (/^([AMD ]+)\s+of\s+([^\s]+)\s+for\s+([^\s]+)\s+diff\s+([^\s]+)$/) {
> --
> gitgitgadget
>
prev parent reply other threads:[~2019-09-12 8:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 6:39 [PATCH 0/1] Fix perl error "unescaped left brace in regex" for paranoid update hook Dominic Winkler via GitGitGadget
2019-09-10 6:39 ` [PATCH 1/1] " Dominic Winkler via GitGitGadget
2019-09-11 21:28 ` Johannes Schindelin
2019-09-11 21:47 ` [PATCH v2 0/1] " Dominic Winkler via GitGitGadget
2019-09-11 21:47 ` [PATCH v2 1/1] contrib/hooks: escape left brace in regex in the " Dominic Winkler via GitGitGadget
2019-09-12 8:56 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.1909121055580.47@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=d.winkler@flexarts.at \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/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).