Here is the series that squashes the fixups in rj/add-p-pager.
I don't have a strong preference for this over what's already in
rj/add-p-pager, but let's go through the changes Phillip has suggested,
even if it's just to archive them in the list.
Thanks.
Rubén Justo (4):
add-patch: test for 'p' command
pager: do not close fd 2 unnecessarily
pager: introduce wait_for_pager
add-patch: render hunks through the pager
add-patch.c | 18 +++++++++++---
pager.c | 48 ++++++++++++++++++++++++++++++++++----
pager.h | 1 +
t/t3701-add-interactive.sh | 48 ++++++++++++++++++++++++++++++++++++++
4 files changed, 107 insertions(+), 8 deletions(-)
Range-diff:
1: 5fdfd2f3bd = 1: 9f358c6d69 add-patch: test for 'p' command
2: 506f457e48 = 2: f45a7ca9b2 pager: do not close fd 2 unnecessarily
3: b29c59e3d2 ! 3: 9d7a50e531 pager: introduce wait_for_pager
@@ Commit message
In the interactive commands (i.e.: add -p) we want to use the pager for
some output, while maintaining the interaction with the user.
- Modify the pager machinery so that we can use setup_pager and, once
+ Modify the pager machinery so that we can use `setup_pager()` and, once
we've finished sending the desired output for the pager, wait for the
- pager termination using a new function wait_for_pager. Make this
+ pager termination using a new function `wait_for_pager()`. Make this
function reset the pager machinery before returning.
+ One specific point to note is that we avoid forking the pager in
+ `setup_pager()` if the configured pager is an empty string [*1*] or
+ simply "cat" [*2*]. In these cases, `setup_pager()` does nothing and
+ therefore `wait_for_pager()` should not be called.
+
+ We could modify `setup_pager()` to return an indication of these
+ situations, so we could avoid calling `wait_for_pager()`.
+
+ However, let's avoid transferring 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 the 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@xxxxxxxxx>
- Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
## pager.c ##
@@ pager.c: int pager_use_color = 1;
@@ pager.c: 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");
4: 6bc52a5543 ! 4: 6f4990c0d4 add-patch: render hunks through the pager
@@ Commit message
this limit.
Signed-off-by: Rubén Justo <rjusto@xxxxxxxxx>
- Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
## add-patch.c ##
@@
@@ t/t3701-add-interactive.sh: test_expect_success 'print again the hunk' '
+ test_when_finished "rm -f huge_file; git reset" &&
+ printf "\n%2500000s" Y >huge_file &&
+ git add -N huge_file &&
-+ test_write_lines P q | GIT_PAGER="head -n 1" test_terminal git add -p
++ test_write_lines P q | (
++ GIT_PAGER="head -n 1" &&
++ export GIT_PAGER &&
++ test_terminal git add -p
++ )
+'
+
test_expect_success 'split hunk "add -p (edit)"' '
5: b7637a9f21 < -: ---------- t3701: avoid one-shot export for shell functions
6: 4b53ff8c0e < -: ---------- pager: make wait_for_pager a no-op for "cat"
base-commit: a7dae3bdc8b516d36f630b12bb01e853a667e0d9
--
2.46.0.rc0.4.g6f4990c0d4
