mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

Make 'git var GIT_PAGER' always print the configured pager

Browse source 
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: Sebastian Celis <sebastian@sebastiancelis.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-02-14 05:59:59 -06:00 committed by Junio C Hamano
parent 9fabb6d751
commit 64778d24a9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin-var.c
View file

@ -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";

2
cache.h
View file

@ -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;

6
pager.c
View file

@ -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;