From: Andreas Schwab <schwab@linux-m68k.org>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Jeff King <peff@peff.net>, Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] contrib/git-resurrect.sh: use hash-agnostic OID pattern
Date: Fri, 09 Oct 2020 09:55:53 +0200 [thread overview]
Message-ID: <874kn3rfxy.fsf@igel.home> (raw)
In-Reply-To: <20201008221101.GO1392312@camp.crustytoothpaste.net> (brian m. carlson's message of "Thu, 8 Oct 2020 22:11:01 +0000")
On Okt 08 2020, brian m. carlson wrote:
> On 2020-10-08 at 16:13:45, Jeff King wrote:
>> On Wed, Oct 07, 2020 at 11:44:40PM -0700, Denton Liu wrote:
>> > search_merges () {
>> > git rev-list --all --grep="Merge branch '$1'" \
>> > --pretty=tformat:"%P %s" |
>> > - sed -ne "/^$_x40 \($_x40\) Merge .*/ {s//\1/p;$early_exit}"
>> > + sed -ne "/^$oid_pattern \($oid_pattern\) Merge .*/ {s//\1/p;$early_exit}"
>> > }
>> >
>> > search_merge_targets () {
>> > git rev-list --all --grep="Merge branch '[^']*' into $branch\$" \
>> > --pretty=tformat:"%H %s" --all |
>> > - sed -ne "/^\($_x40\) Merge .*/ {s//\1/p;$early_exit} "
>> > + sed -ne "/^\($oid_pattern\) Merge .*/ {s//\1/p;$early_exit} "
>> > }
>>
>> in both cases we are matching output we asked for, so we really matching
>> [0-9a-f]\+ would be correct and sufficient. That's a little simpler. I
>> don't feel too strongly either way, though.
>
> The problem here is that we'd need to write [0-9a-f][0-9a-f]* because
> this is a BRE and a backslashed + here is a GNU extension.
I wonder why --pretty uses %s when it is filtered out again anyway?
(There is also a duplicate --all.)
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
next prev parent reply other threads:[~2020-10-09 7:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 6:44 [PATCH 0/2] contrib/git-resurrect.sh: make it hash-agnostic Denton Liu
2020-10-08 6:44 ` [PATCH 1/2] contrib/git-resurrect.sh: indent with tabs Denton Liu
2020-10-08 17:32 ` Junio C Hamano
2020-10-08 18:48 ` Junio C Hamano
2020-10-08 6:44 ` [PATCH 2/2] contrib/git-resurrect.sh: use hash-agnostic OID pattern Denton Liu
2020-10-08 16:13 ` Jeff King
2020-10-08 18:29 ` Junio C Hamano
2020-10-08 19:53 ` Jeff King
2020-10-08 22:11 ` brian m. carlson
2020-10-09 7:55 ` Andreas Schwab [this message]
2020-10-09 11:53 ` Jeff King
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=874kn3rfxy.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.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.
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 NNTP newsgroup(s).