cad3a2056d
It was very unfortunate that we added core.pager setting to the configuration file; even when the underlying command does not care if there is no git repository is involved (think "git diff --no-index"), the user would now rightfully want the configuration setting to be honored, which means we would need to read the configuration file before we launch the pager. This is a minimum change in the sense that it restores the old behaviour of not even reading config in setup_git_directory(), but have the core.pager honored when we know it matters. Note that this does not cover "git -p --git-dir where command"; the -p option immediately trigger the pager settings before we even see --git-dir to learn where the configuration file is, so we will end up reading the configuration from the place where we would _normally_ find the git repository. Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.2 KiB
C
75 lines
1.2 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) {
|
|
if (!pager_program)
|
|
git_config(git_default_config);
|
|
pager = pager_program;
|
|
}
|
|
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);
|
|
}
|