From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: [PATCH v2 2/2] pager: make wait_for_pager a no-op for "cat"
Date: Tue, 23 Jul 2024 02:42:56 +0200 [thread overview]
Message-ID: <a2d6169f-61ee-4a3f-9f8a-f791229c25a2@gmail.com> (raw)
In-Reply-To: <7c9ec43d-f52f-49b7-b1f3-fe3c85554006@gmail.com>
If we find that the configured pager is an empty string [*1*] or simply
"cat" [*2*], then we return from `setup_pager()` silently without doing
anything, allowing the output to go directly to the normal stdout.
If `setup_pager()` avoids forking a pager, then when the client calls
the corresponding `wait_for_pager()`, we might fail trying to terminate
a process that wasn't started.
One solution to avoid this problem could be to make the caller aware
that `setup_pager()` did nothing, so it could avoid calling
`wait_for_pager()`.
However, let's avoid shifting that responsibility to the caller and
instead treat the call to `wait_for_pager()` as a no-op when we know we
haven't forked a pager.
1.- 402461aab1 (pager: do not fork a pager if PAGER is set to empty.,
2006-04-16)
2.- caef71a535 (Do not fork PAGER=cat, 2006-04-16)
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
| 3 +++
1 file changed, 3 insertions(+)
--git a/pager.c b/pager.c
index bea4345f6f..896f40fcd2 100644
--- a/pager.c
+++ b/pager.c
@@ -46,6 +46,9 @@ static void wait_for_pager_atexit(void)
void wait_for_pager(void)
{
+ if (old_fd1 == -1)
+ return;
+
finish_pager();
sigchain_pop_common();
unsetenv("GIT_PAGER_IN_USE");
--
2.45.1
next prev parent reply other threads:[~2024-07-23 0:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 0:39 [PATCH v2 0/2] add-p P fixups Rubén Justo
2024-07-23 0:42 ` [PATCH v2 1/2] t3701: avoid one-shot export for shell functions Rubén Justo
2024-07-23 0:42 ` Rubén Justo [this message]
2024-07-23 0:54 ` [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-23 9:15 ` Phillip Wood
2024-07-23 16:52 ` Junio C Hamano
2024-07-23 22:08 ` Rubén Justo
2024-07-24 15:21 ` phillip.wood123
2024-07-24 16:12 ` Rubén Justo
2024-07-25 9:45 ` Phillip Wood
2024-07-25 12:16 ` Rubén Justo
2024-07-25 13:42 ` [PATCH 0/4] squash fixups in rj/add-p-pager Rubén Justo
2024-07-25 13:44 ` [PATCH 1/4] add-patch: test for 'p' command Rubén Justo
2024-07-25 13:44 ` [PATCH 2/4] pager: do not close fd 2 unnecessarily Rubén Justo
2024-07-25 13:44 ` [PATCH 3/4] pager: introduce wait_for_pager Rubén Justo
2024-07-25 13:44 ` [PATCH 4/4] add-patch: render hunks through the pager Rubén Justo
2024-07-25 15:24 ` [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-25 16:41 ` Re* " Rubén Justo
2024-07-25 16:43 ` [PATCH 1/2] pager: introduce wait_for_pager Rubén Justo
2024-07-25 16:43 ` [PATCH 2/2] add-patch: render hunks through the pager Rubén Justo
2024-07-26 18:36 ` Junio C Hamano
2024-07-27 1:40 ` Junio C Hamano
2024-07-27 14:33 ` Rubén Justo
2024-07-26 18:24 ` Re* [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-26 19:22 ` Rubén Justo
2024-07-26 19:48 ` Junio C Hamano
2024-07-26 20:16 ` Rubén Justo
2024-07-28 9:11 ` Rubén Justo
2024-07-29 18:45 ` Junio C Hamano
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=a2d6169f-61ee-4a3f-9f8a-f791229c25a2@gmail.com \
--to=rjusto@gmail.com \
--cc=43e045e5-4c92-4c5f-b183-d63c5b510023@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.
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).