mirror of
https://github.com/git/git.git
synced 2024-11-18 20:53:55 +01:00
35ce862279
If you resize the terminal while less is waiting for input, less will exit entirely without even showing the output. This is very noticeable if you do something like "git diff" on a big and cold-cache tree and git takes a few seconds to think, and then you resize the window while it's preparing. Boom. No output AT ALL. The way to reproduce the problem is to do some pager operation that takes a while in git, and resizing the window while git is thinking about the output. Try git diff --stat v2.6.12.. in the kernel tree to do something where it takes a while for git to start outputting information. Signed-off-by: Junio C Hamano <junkio@cox.net>
70 lines
1.1 KiB
C
70 lines
1.1 KiB
C
#include "cache.h"
|
|
|
|
#include <sys/select.h>
|
|
|
|
/*
|
|
* This is split up from the rest of git so that we might do
|
|
* something different on Windows, for example.
|
|
*/
|
|
|
|
static void run_pager(const char *pager)
|
|
{
|
|
/*
|
|
* Work around bug in "less" by not starting it until we
|
|
* have real input
|
|
*/
|
|
fd_set in;
|
|
|
|
FD_ZERO(&in);
|
|
FD_SET(0, &in);
|
|
select(1, &in, NULL, &in, NULL);
|
|
|
|
execlp(pager, pager, NULL);
|
|
execl("/bin/sh", "sh", "-c", pager, NULL);
|
|
}
|
|
|
|
void setup_pager(void)
|
|
{
|
|
pid_t pid;
|
|
int fd[2];
|
|
const char *pager = getenv("GIT_PAGER");
|
|
|
|
if (!isatty(1))
|
|
return;
|
|
if (!pager)
|
|
pager = getenv("PAGER");
|
|
if (!pager)
|
|
pager = "less";
|
|
else if (!*pager || !strcmp(pager, "cat"))
|
|
return;
|
|
|
|
pager_in_use = 1; /* means we are emitting to terminal */
|
|
|
|
if (pipe(fd) < 0)
|
|
return;
|
|
pid = fork();
|
|
if (pid < 0) {
|
|
close(fd[0]);
|
|
close(fd[1]);
|
|
return;
|
|
}
|
|
|
|
/* return in the child */
|
|
if (!pid) {
|
|
dup2(fd[1], 1);
|
|
close(fd[0]);
|
|
close(fd[1]);
|
|
return;
|
|
}
|
|
|
|
/* The original process turns into the PAGER */
|
|
dup2(fd[0], 0);
|
|
close(fd[0]);
|
|
close(fd[1]);
|
|
|
|
setenv("LESS", "FRSX", 0);
|
|
run_pager(pager);
|
|
die("unable to execute pager '%s'", pager);
|
|
exit(255);
|
|
}
|