From: Johannes Altmanninger <aclopte@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] rerere-train: two fixes to the use of "git show -s"
Date: Mon, 28 Feb 2022 06:33:15 +0100 [thread overview]
Message-ID: <20220228053315.czkke7hfiav4qh3s@gmail.com> (raw)
In-Reply-To: <20220227220924.2144325-1-gitster@pobox.com>
On Sun, Feb 27, 2022 at 02:09:24PM -0800, Junio C Hamano wrote:
> The script uses "git show -s" to display the title of the merge
> commit being studied, without explicitly disabling the pager, which
> is not a safe thing to do in a script.
>
> For example, when the pager is set to "less" with "-SF" options (-S
> tells the pager not to fold lines but allow horizontal scrolling to
> show the overly long lines, -F tells the pager not to wait if the
> output in its entirety is shown on a single page), and the title of
> the merge commit is longer than the width of the terminal, the pager
> will wait until the end-user tells it to quit after showing the
> single line.
>
> Explicitly disable the pager with this "git show" invocation to fix
> this.
>
> The command uses the "--pretty=format:..." format, which adds LF in
> between each pair of commits it outputs, which means that the label
> for the merge being learned from will be followed by the next
> message on the same line. "--pretty=tformat:..." is what we should
> instead, which adds LF after each commit, or a more modern way to
> spell it, i.e. "--format=...". This existing breakage becomes
> easier to see, now we no longer use the pager.
Sounds good (definitely better than two separate commits).
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>
> * Relative to the initial version, the "--no-merges" change has
it was "--merges", not "--no-merges"
> been removed because the end user can still give --merges from
> the command line and the filtering of merges done by the script
> is still needed for correctness.
You probably mean that the user can pass "--no-merges HEAD"
but that would just make the effective command
git rev-list --merges --no-merges HEAD
which outputs nothing. I don't think `git rev-list --merges "$@"` will
ever output non-merge commits, so the filtering should not be necessary.
>
> contrib/rerere-train.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
> index 75125d6ae0..26b724c8c6 100755
> --- a/contrib/rerere-train.sh
> +++ b/contrib/rerere-train.sh
> @@ -86,7 +86,7 @@ do
> fi
> if test -s "$GIT_DIR/MERGE_RR"
> then
> - git show -s --pretty=format:"Learning from %h %s" "$commit"
> + git --no-pager show -s --format="Learning from %h %s" "$commit"
> git rerere
> git checkout -q $commit -- .
> git rerere
> --
> 2.35.1-354-g715d08a9e5
>
prev parent reply other threads:[~2022-02-28 5:33 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
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 [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=20220228053315.czkke7hfiav4qh3s@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).