# [PATCH] format-patch: page output with --stdout 3 messages from 2010-11-20 to 2010-11-23. Participants: Tay Ray Chuan, Jonathan Nieder. Thread: https://gitlist.dev/t/25794 ## Tay Ray Chuan, 2010-11-20 05:05 Subject: [PATCH] format-patch: page output with --stdout Message-ID: <1290229542-3116-1-git-send-email-rctay89@gmail.com> URL: https://gitlist.dev/e/1290229542-3116-1-git-send-email-rctay89%40gmail.com ``` Pass output through the pager if format-patch is run with --stdout. This saves the user the trouble of running git with '-p' or piping through a pager. setup_pager() already checks if stdout is a tty, so we don't have to worry about behaviour if the user redirects/pipes stdout. Signed-off-by: Tay Ray Chuan --- builtin/log.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index d0297a1..c631950 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1159,6 +1159,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (!use_stdout) output_directory = set_outdir(prefix, output_directory); + else + setup_pager(); if (output_directory) { if (use_stdout) -- 1.7.3.2.492.gfc3d1.dirty ``` ## Jonathan Nieder, 2010-11-22 18:15 Subject: Re: [PATCH] format-patch: page output with --stdout Message-ID: <20101122181501.GF2084@burratino> URL: https://gitlist.dev/e/20101122181501.GF2084%40burratino In-Reply-To: <1290229542-3116-1-git-send-email-rctay89@gmail.com> ``` Tay Ray Chuan wrote: > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1159,6 +1159,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > > if (!use_stdout) > output_directory = set_outdir(prefix, output_directory); > + else > + setup_pager(); Since it can be disabled with [pager] format-patch = false this looks reasonable to me. Maybe a test to that effect would help, something like this? test_expect_success TTY 'format-patch --stdout paginates' ' rm -f pager_used && ( GIT_PAGER="wc >pager_used" && export GIT_PAGER && test_terminal git format-patch --stdout --all ) && test_path_is_file pager_used ' test_expect_success TTY 'format-patch --stdout pagination can be disabled' ' rm -f pager_used && ( GIT_PAGER="wc >pager_used" && export GIT_PAGER && test_terminal git --no-pager format-patch --stdout --all && test_terminal git -c "pager.format-patch=false" format-patch --stdout --all ) && test_path_is_missing pager_used && test_path_is_missing .git/pager_used ' ``` ## Tay Ray Chuan, 2010-11-23 03:16 Subject: [PATCH v2] format-patch: page output with --stdout Message-ID: <1290482190-5932-1-git-send-email-rctay89@gmail.com> URL: https://gitlist.dev/e/1290482190-5932-1-git-send-email-rctay89%40gmail.com In-Reply-To: <20101122181501.GF2084@burratino> ``` Pass output through the pager if format-patch is run with --stdout. This saves the user the trouble of running git with '-p' or piping through a pager. setup_pager() already checks if stdout is a tty, so we don't have to worry about behaviour if the user redirects/pipes stdout. Paging can also be disabled with the config [pager] format-patch = false Add tests to check for these behaviour. Helped-by: Jonathan Nieder Signed-off-by: Tay Ray Chuan --- Thanks for the tests, Johnathan. builtin/log.c | 2 ++ t/t4014-format-patch.sh | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index d0297a1..c631950 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1159,6 +1159,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (!use_stdout) output_directory = set_outdir(prefix, output_directory); + else + setup_pager(); if (output_directory) { if (use_stdout) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 07bf6eb..027c13d 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -6,6 +6,7 @@ test_description='various format-patch tests' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-terminal.sh test_expect_success setup ' @@ -686,4 +687,26 @@ test_expect_success 'format-patch --signature="" supresses signatures' ' ! grep "^-- \$" output ' +test_expect_success TTY 'format-patch --stdout paginates' ' + rm -f pager_used && + ( + GIT_PAGER="wc >pager_used" && + export GIT_PAGER && + test_terminal git format-patch --stdout --all + ) && + test_path_is_file pager_used +' + + test_expect_success TTY 'format-patch --stdout pagination can be disabled' ' + rm -f pager_used && + ( + GIT_PAGER="wc >pager_used" && + export GIT_PAGER && + test_terminal git --no-pager format-patch --stdout --all && + test_terminal git -c "pager.format-patch=false" format-patch --stdout --all + ) && + test_path_is_missing pager_used && + test_path_is_missing .git/pager_used +' + test_done -- 1.7.3.2.487.gd5344.dirty ```