From: Johannes Altmanninger <aclopte@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rerere-train: modernise a bit
Date: Sun, 27 Feb 2022 19:02:03 +0100 [thread overview]
Message-ID: <20220227180203.pakrqimsxbjx47tu@gmail.com> (raw)
In-Reply-To: <xmqqsfsjuw8m.fsf@gitster.g>
On Tue, Feb 15, 2022 at 11:05:45PM -0800, Junio C Hamano wrote:
> The script wants to create a list of merges using "rev-list" and
> filters commits that do not have more than one parent, but if we
> always pass "--merges" to "rev-list", there is no need to filter.
>
> The command uses "git show --pretty=format:..." on a single commit
> while generating progress reports, which means this title line is
> left unterminated. It should have used --pretty=tformat:...
Yep, tformat is more correct semantically, but it's worth noting that there
is no behavior change here. These commands behave the same
git show -s --pretty=tformat:"Learning" HEAD
git show -s --pretty=format:"Learning" HEAD
I guess we automagically add a final newline somewhere, if it's missing.
If there is a final newline ("Learning%n"), then the commands show different
behavior. The subject (%s) can never have a newline, so that's not the
case here.
I'd add something like this (for the lack of knowing where exactly the
implicit newline comes from):
No harm was done because we implicitly add the trailing newline,
but it should have used --pretty=tformat:...
> instead, or better yet, use the more modern --format=... to ensure
> that the title line is properly terminated.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> contrib/rerere-train.sh | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git c/contrib/rerere-train.sh w/contrib/rerere-train.sh
> index 75125d6ae0..499b07e4a6 100755
> --- c/contrib/rerere-train.sh
> +++ w/contrib/rerere-train.sh
> @@ -66,14 +66,9 @@ original_HEAD=$(git rev-parse --verify HEAD) || {
>
> mkdir -p "$GIT_DIR/rr-cache" || exit
>
> -git rev-list --parents "$@" |
> +git rev-list --parents --merges "$@" |
> while read commit parent1 other_parents
> do
> - if test -z "$other_parents"
> - then
> - # Skip non-merges
> - continue
> - fi
> git checkout -q "$parent1^0"
> if git merge $other_parents >/dev/null 2>&1
> then
> @@ -86,7 +81,7 @@ do
> fi
> if test -s "$GIT_DIR/MERGE_RR"
> then
> - git show -s --pretty=format:"Learning from %h %s" "$commit"
> + git show -s --format="Learning from %h %s" "$commit"
> git rerere
> git checkout -q $commit -- .
> git rerere
next prev parent reply other threads:[~2022-02-27 18:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 7:05 [PATCH] rerere-train: modernise a bit Junio C Hamano
2022-02-20 19:52 ` Derrick Stolee
2022-02-27 18:02 ` Johannes Altmanninger [this message]
2022-02-27 19:07 ` Re* " Junio C Hamano
2022-02-27 20:23 ` Johannes Altmanninger
2022-02-27 22:13 ` Junio C Hamano
2022-02-27 22:09 ` [PATCH v2] rerere-train: two fixes to the use of "git show -s" Junio C Hamano
2022-02-28 5:33 ` Johannes Altmanninger
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=20220227180203.pakrqimsxbjx47tu@gmail.com \
--to=aclopte@gmail.com \
--cc=git@vger.kernel.org \
--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).