From: Johannes Sixt <j6t@kdbg.org>
To: Denton Liu <liu.denton@gmail.com>
Cc: Vincent Lefevre <vincent@vinc17.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] pager: exit without error on SIGPIPE
Date: Sat, 30 Jan 2021 09:29:18 +0100 [thread overview]
Message-ID: <a3e738e2-695e-cf01-5d01-50b6fea272ec@kdbg.org> (raw)
In-Reply-To: <bc88492979fee215d5be06ccbc246ae0171a9ced.1611910122.git.liu.denton@gmail.com>
Am 30.01.21 um 00:48 schrieb Denton Liu:
> If the pager closes before the git command feeding the pager finishes,
> git is killed by a SIGPIPE and the corresponding exit code is 141.
> Since the pipe is just an implementation detail, it does not make sense
> for this error code to be user-facing.
>
> Handle SIGPIPEs by simply calling exit(0) in wait_for_pager_signal().
>
> Introduce `test-tool pager` which infinitely prints `y` to the pager in
> order to test the new behavior. This cannot be tested with any existing
> git command because there are no other commands which produce infinite
> output. Without the change to pager.c, the newly introduced test fails.
>
> Reported-by: Vincent Lefevre <vincent@vinc17.net>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
...
> diff --git a/pager.c b/pager.c
> index ee435de675..5922d99dc8 100644
> --- a/pager.c
> +++ b/pager.c
> @@ -34,6 +34,8 @@ static void wait_for_pager_atexit(void)
> static void wait_for_pager_signal(int signo)
> {
> wait_for_pager(1);
> + if (signo == SIGPIPE)
> + exit(0);
> sigchain_pop(signo);
> raise(signo);
> }
> diff --git a/t/helper/test-pager.c b/t/helper/test-pager.c
> new file mode 100644
> index 0000000000..feb68b8643
> --- /dev/null
> +++ b/t/helper/test-pager.c
> @@ -0,0 +1,12 @@
> +#include "test-tool.h"
> +#include "cache.h"
> +
> +int cmd__pager(int argc, const char **argv)
> +{
> + if (argc > 1)
> + usage("\ttest-tool pager");
> +
> + setup_pager();
> + for (;;)
> + puts("y");
> +}
My gut feeling tells that this will end in an infinite loop on Windows.
There are no signals on Windows that would kill the upstream of a pipe.
This call site will only notice that the downstream of the pipe was
closed, when it checks for write errors.
Let me test it.
-- Hannes
next prev parent reply other threads:[~2021-01-30 9:32 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 16:15 git fails with a broken pipe when one quits the pager Vincent Lefevre
2021-01-29 23:48 ` [PATCH] pager: exit without error on SIGPIPE Denton Liu
2021-01-30 8:29 ` Johannes Sixt [this message]
2021-01-30 12:52 ` Johannes Sixt
2021-02-01 15:03 ` Ævar Arnfjörð Bjarmason
2021-02-01 17:47 ` Junio C Hamano
2021-02-01 19:52 ` Ævar Arnfjörð Bjarmason
2021-02-01 20:55 ` Junio C Hamano
2021-02-02 2:05 ` Ævar Arnfjörð Bjarmason
2021-02-02 4:45 ` Junio C Hamano
2021-02-02 5:25 ` Junio C Hamano
2021-02-02 7:45 ` Johannes Sixt
2021-02-02 20:13 ` Junio C Hamano
2021-02-02 22:15 ` Johannes Sixt
2021-02-02 22:21 ` Junio C Hamano
2021-02-03 17:07 ` Johannes Sixt
2021-02-03 18:12 ` Junio C Hamano
2021-02-04 15:10 ` Vincent Lefevre
2021-02-03 2:45 ` Ævar Arnfjörð Bjarmason
2021-02-03 2:54 ` Junio C Hamano
2021-02-03 3:36 ` Ævar Arnfjörð Bjarmason
2021-02-03 17:19 ` Johannes Sixt
2021-01-31 1:47 ` git fails with a broken pipe when one quits the pager Ævar Arnfjörð Bjarmason
2021-01-31 3:36 ` Vincent Lefevre
2021-01-31 3:47 ` Vincent Lefevre
2021-01-31 20:49 ` Ævar Arnfjörð Bjarmason
2021-02-01 10:34 ` Vincent Lefevre
2021-02-01 11:33 ` Chris Torek
2021-02-01 12:36 ` Vincent Lefevre
2021-02-01 12:53 ` Chris Torek
2021-02-01 15:17 ` Vincent Lefevre
2021-02-01 15:00 ` Ævar Arnfjörð Bjarmason
2021-02-01 12:10 ` Ævar Arnfjörð Bjarmason
2021-02-01 14:48 ` Vincent Lefevre
2021-02-01 15:44 ` Ævar Arnfjörð Bjarmason
2021-02-01 22:16 ` Johannes Sixt
2021-02-03 2:48 ` Ævar Arnfjörð Bjarmason
2021-02-03 17:11 ` Johannes Sixt
2021-02-03 15:26 ` Vincent Lefevre
2021-02-04 0:14 ` Ævar Arnfjörð Bjarmason
2021-02-04 15:38 ` Vincent Lefevre
2021-02-01 14:49 ` [PATCH 0/3] pager: test for exit behavior & trace2 bug fix Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 0/5] " Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 1/5] pager: refactor wait_for_pager() function Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 2/5] pager: test for exit code with and without SIGPIPE Ævar Arnfjörð Bjarmason
2021-02-02 8:50 ` Denton Liu
2021-02-05 7:47 ` Johannes Sixt
2021-02-02 1:59 ` [PATCH v2 3/5] run-command: add braces for "if" block in wait_or_whine() Ævar Arnfjörð Bjarmason
2021-02-02 2:00 ` [PATCH v2 4/5] pager: properly log pager exit code when signalled Ævar Arnfjörð Bjarmason
2021-02-05 7:58 ` Johannes Sixt
2021-02-05 11:37 ` Junio C Hamano
2021-02-02 2:00 ` [WIP/PATCH v2 5/5] WIP pager: respect exit code of pager over SIGPIPE Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 1/3] pager: test for exit code Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 2/3] pager: refactor wait_for_pager() function Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 3/3] pager: properly log pager exit code when signalled Ævar Arnfjörð Bjarmason
2021-02-01 18:07 ` Junio C Hamano
2021-02-01 19:21 ` Ævar Arnfjörð Bjarmason
2021-02-01 18:15 ` Junio C Hamano
2021-02-01 19:23 ` Ævar Arnfjörð Bjarmason
2021-02-01 22:04 ` git fails with a broken pipe when one quits the pager Johannes Sixt
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=a3e738e2-695e-cf01-5d01-50b6fea272ec@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=vincent@vinc17.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.
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).