Skip to content

Commit

Permalink
pager: do wait_for_pager on signal death
Browse files Browse the repository at this point in the history
Since ea27a18 (spawn pager via run_command interface), the
original git process actually does git work, and the pager
is a child process (actually, on Windows it has always been
that way, since Windows lacks fork). After spawning the
pager, we register an atexit() handler that waits for the
pager to finish.

Unfortunately, that handler does not always run. In
particular, if git is killed by a signal, then we exit
immediately. The calling shell then thinks that git is done;
however, the pager is still trying to run and impact the
terminal. The result can be seen by running a long git
process with a pager (e.g., "git log -p") and hitting ^C.
Depending on your config, you should see the shell prompt,
but pressing a key causes the pager to do any terminal
de-initialization sequence.

This patch just intercepts any death-dealing signals and
waits for the pager before dying. Under typical less
configuration, that means hitting ^C will cause git to stop
generating output, but the pager will keep running.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jan 22, 2009
1 parent 57b235a commit a3da882
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions pager.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "cache.h"
#include "run-command.h"
#include "sigchain.h"

/*
* This is split up from the rest of git so that we can do
Expand Down Expand Up @@ -38,6 +39,13 @@ static void wait_for_pager(void)
finish_command(&pager_process);
}

static void wait_for_pager_signal(int signo)
{
wait_for_pager();
sigchain_pop(signo);
raise(signo);
}

void setup_pager(void)
{
const char *pager = getenv("GIT_PAGER");
Expand Down Expand Up @@ -75,6 +83,7 @@ void setup_pager(void)
close(pager_process.in);

/* this makes sure that the parent terminates after the pager */
sigchain_push_common(wait_for_pager_signal);
atexit(wait_for_pager);
}

Expand Down

0 comments on commit a3da882

Please sign in to comment.