git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4] pager: die when paging to non-existing command

From
Rubén Justo <rjusto@gmail.com>
Date
Jun 23, 2024, 07:09 UTC
Message-ID
<392deded-9eb2-42fa-b6f9-54c22d3ffd33@gmail.com>
In-Reply-To
<6850f558-ad20-403a-ae1e-5b9826c53790@gmail.com>

When trying to execute a non-existent program from GIT_PAGER, we display an error. However, we also send the complete text to the terminal and return a successful exit code. This can be confusing for the user and the displayed error could easily become obscured by a lengthy text.

For example, here the error message would be very far above after sending 50 MB of text:

    $ GIT_PAGER=non-existent t/test-terminal.perl git log | wc -c
    error: cannot run non-existent: No such file or directory
    50314363

Let's make the error clear by aborting the process and return an error so that the user can easily correct their mistake.

This will be the result of the change:
    $ GIT_PAGER=non-existent t/test-terminal.perl git log | wc -c
    error: cannot run non-existent: No such file or directory
    fatal: unable to execute pager 'non-existent'
    0

The behavior change we're introducing in this commit affects two tests in t7006, which is a good sign regarding test coverage and requires us to address it.

The first test is 'git skips paging non-existing command'. This test comes from f7991f01f2 (t7006: clean up SIGPIPE handling in trace2 tests, 2021-11-21,) where a modification was made to a test that was originally introduced in c24b7f6736 (pager: test for exit code with and without SIGPIPE, 2021-02-02). That original test was, IMHO, in the same direction we're going in this commit.

At any rate, this test obviously needs to be adjusted to check the new behavior we are introducing. Do it.

The second test being affected is: 'non-existent pager doesnt cause crash', introduced in f917f57f40 (pager: fix crash when pager program doesn't exist, 2021-11-24). As its name states, it has the intention of checking that we don't introduce a regression that produces a crash when GIT_PAGER points to a nonexistent program.

This test could be considered redundant nowadays, due to us already having several tests checking implicitly what a non-existent command in GIT_PAGER produces. However, let's maintain a good belt-and-suspenders strategy; adapt it to the new world.

Finally, it's worth noting that we are not changing the behavior if the command specified in GIT_PAGER is a shell command. In such cases, it is:

    $ GIT_PAGER=:\;non-existent t/test-terminal.perl git log
    :;non-existent: 1: non-existent: not found
    died of signal 13 at t/test-terminal.perl line 33.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
Error pointed out by Hannes in:
https://lore.kernel.org/git/f031c152-1b97-4598-92f3-a72aefd701a4@kdbg.org
Thanks!
Range-diff against v2:
1:  60e852bffb ! 1:  93d6074a17 pager: die when paging to non-existing command
    @@ Commit message
     
             $ GIT_PAGER=non-existent t/test-terminal.perl git log | wc -c
             error: cannot run non-existent: No such file or directory
    -        fatal: unable to start the pager: 'non-existent'
    +        fatal: unable to execute pager 'non-existent'
             0
     
         The behavior change we're introducing in this commit affects two tests
 pager.c          |  2 +-
 t/t7006-pager.sh | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/pager.c b/pager.c
index e9e121db69..be6f4ee59f 100644
--- a/pager.c
+++ b/pager.c
@@ -137,7 +137,7 @@ void setup_pager(void)
 	pager_process.in = -1;
 	strvec_push(&pager_process.env, "GIT_PAGER_IN_USE");
 	if (start_command(&pager_process))
-		return;
+		die("unable to execute pager '%s'", pager);
 
 	/* original process continues, but writes to the pipe */
 	dup2(pager_process.in, 1);
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index e56ca5b0fa..932c26cb45 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -725,18 +725,11 @@ test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' '
 	test_path_is_file pager-used
 '
 
-test_expect_success TTY 'git skips paging nonexisting command' '
-	test_when_finished "rm trace.normal" &&
+test_expect_success TTY 'git errors when asked to execute nonexisting pager' '
+	test_when_finished "rm -f err" &&
 	test_config core.pager "does-not-exist" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
-
-	test_terminal git log &&
-
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:-1 " child-exits
+	test_must_fail test_terminal git log 2>err &&
+	test_grep "unable to execute pager" err
 '
 
 test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
@@ -762,7 +755,7 @@ test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
 
 test_expect_success TTY 'non-existent pager doesnt cause crash' '
 	test_config pager.show invalid-pager &&
-	test_terminal git show
+	test_must_fail test_terminal git show
 '
 
 test_done
-- 
2.45.1
Previous: Johannes Sixt
Message 17 of 17 in “pager: die when paging to non-existing command”
  1. pager: die when paging to non-existing commandRubén Justo, Jun 20, 2024
  2. Junio C HamanoJun 20, 2024
  3. Rubén JustoJun 20, 2024
  4. Junio C HamanoJun 20, 2024
  5. Johannes SixtJun 20, 2024
  6. Junio C HamanoJun 20, 2024
  7. Jeff KingJun 21, 2024
  8. Dragan SimicJun 21, 2024
  9. Johannes SchindelinJun 24, 2024
  10. Phillip WoodJun 21, 2024
  11. Junio C HamanoJun 21, 2024
  12. Jeff KingJun 21, 2024
  13. Rubén JustoJun 21, 2024
  14. pager: die when paging to non-existing commandRubén Justo, Jun 21, 2024
  15. pager: die when paging to non-existing commandRubén Justo, Jun 21, 2024
  16. Johannes SixtJun 22, 2024
  17. pager: die when paging to non-existing commandRubén Justo, Jun 23, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.