Commit 64778d24 authored by Jonathan Nieder's avatar Jonathan Nieder Committed by Junio C Hamano

Make 'git var GIT_PAGER' always print the configured pager

Scripted commands that want to use git’s configured pager know better
than ‘git var’ does whether stdout is going to be a tty at the
appropriate time.  Checking isatty(1) as git_pager() does now won’t
cut it, since the output of git var itself is almost never a terminal.
The symptom is that when used by humans, ‘git var GIT_PAGER’ behaves
as it should, but when used by scripts, it always returns ‘cat’!

So avoid tricks with isatty() and just always print the configured
pager.

This does not fix the callers to check isatty(1) themselves yet.
Nevertheless, this patch alone is enough to fix 'am --interactive'.

Thanks to Sebastian Celis for the report and Jeff King for the
analysis.
Reported-by: default avatarSebastian Celis <sebastian@sebastiancelis.com>
Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 9fabb6d7
......@@ -20,7 +20,7 @@ static const char *editor(int flag)
static const char *pager(int flag)
{
const char *pgm = git_pager();
const char *pgm = git_pager(1);
if (!pgm)
pgm = "cat";
......
......@@ -775,7 +775,7 @@ extern const char *git_committer_info(int);
extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
extern const char *fmt_name(const char *name, const char *email);
extern const char *git_editor(void);
extern const char *git_pager(void);
extern const char *git_pager(int stdout_is_tty);
struct checkout {
const char *base_dir;
......
......@@ -48,11 +48,11 @@ static void wait_for_pager_signal(int signo)
raise(signo);
}
const char *git_pager(void)
const char *git_pager(int stdout_is_tty)
{
const char *pager;
if (!isatty(1))
if (!stdout_is_tty)
return NULL;
pager = getenv("GIT_PAGER");
......@@ -73,7 +73,7 @@ const char *git_pager(void)
void setup_pager(void)
{
const char *pager = git_pager();
const char *pager = git_pager(isatty(1));
if (!pager)
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment