From: Jeff King <peff@peff.net>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] contrib/git-resurrect.sh: use hash-agnostic OID pattern
Date: Thu, 8 Oct 2020 12:13:45 -0400 [thread overview]
Message-ID: <20201008161345.GD2823778@coredump.intra.peff.net> (raw)
In-Reply-To: <6fad1fc7fdad98c3dda1ec334a10a6a9e311fef8.1602139448.git.liu.denton@gmail.com>
On Wed, Oct 07, 2020 at 11:44:40PM -0700, Denton Liu wrote:
> diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
> index 57a77c03f9..d843df3afd 100755
> --- a/contrib/git-resurrect.sh
> +++ b/contrib/git-resurrect.sh
> @@ -37,19 +37,18 @@ search_reflog_merges () {
> )
> }
>
> -_x40="[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
> -_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
> +oid_pattern=$(git hash-object --stdin </dev/null | sed -e 's/./[0-9a-f]/g')
This looks correct, although...
> 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.
Side note: It's a shame that there is no way to convince rev-list not
to print the "commit ..." header, which is really what we're avoiding
here. We probably should have suppressed it with user-formats when
they were introduced, but it's too late to make that change. I wonder
if it would be worth adding a command-line option, though. I've often
had to hack around this when parsing rev-list output (and sometimes
even resort to using git-log if it's a one-off).
-Peff
next prev parent reply other threads:[~2020-10-08 16:14 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 [this message]
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
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
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=20201008161345.GD2823778@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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).