From: Jeff King <peff@peff.net>
To: Erik Faye-Lund <kusmabite@gmail.com>
Cc: "Dale R. Worley" <worley@alum.mit.edu>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
GIT Mailing-list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] pager: turn on "cat" optimization for DEFAULT_PAGER
Date: Wed, 20 Nov 2013 12:30:54 -0500 [thread overview]
Message-ID: <20131120173054.GA15339@sigill.intra.peff.net> (raw)
In-Reply-To: <CABPQNSb6PD+oSw_LT6KaUYd8BTeN-WHJFodcuiLe=u76rFYFJw@mail.gmail.com>
On Wed, Nov 20, 2013 at 06:24:45PM +0100, Erik Faye-Lund wrote:
> > diff --git a/pager.c b/pager.c
> > index c1ecf65..fa19765 100644
> > --- a/pager.c
> > +++ b/pager.c
> > @@ -54,7 +54,7 @@ const char *git_pager(int stdout_is_tty)
> > pager = getenv("PAGER");
> > if (!pager)
> > pager = DEFAULT_PAGER;
> > - else if (!*pager || !strcmp(pager, "cat"))
> > + if (!*pager || !strcmp(pager, "cat"))
>
> Hmmpf. It's sometimes useful to actually pipe through cat rather than
> disabling the pager, as this changes the return-code from isatty. I
> sometimes use this for debugging-purposes. Does this patch break that?
My patch should not change the behavior of PAGER=cat, GIT_PAGER=cat,
core.pager, etc. It should _only_ impact the case where DEFAULT_PAGER is
set to "cat" (or NULL), and bring it in line with the other cases.
I am not clear on how you are using "cat", so I can't say whether it is
broken. But if you are doing:
PAGER=cat git log
that already is a no-op, and that is not changed by my patch. If you
want to make stdout not a tty, I'd think:
git log | cat
is the right way to do it (and anyway, when the pager is in effect git
will pretend that stdout is a tty, since you would still want things
like auto-color to go to the pager).
-Peff
next prev parent reply other threads:[~2013-11-20 17:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-26 19:57 the pager Dale R. Worley
2013-08-27 4:38 ` Junio C Hamano
2013-08-28 18:19 ` Dale R. Worley
2013-08-28 20:26 ` Junio C Hamano
2013-08-29 15:41 ` Dale R. Worley
2013-08-29 15:55 ` Matthieu Moy
2013-09-03 2:27 ` Dale R. Worley
2013-09-03 2:57 ` Jonathan Nieder
2013-09-03 7:41 ` [PATCH] pager: turn on "cat" optimization for DEFAULT_PAGER Jeff King
2013-09-03 17:35 ` Junio C Hamano
2013-11-20 17:24 ` Erik Faye-Lund
2013-11-20 17:30 ` Jeff King [this message]
2013-11-20 17:33 ` Erik Faye-Lund
2013-11-20 17:33 ` Junio C Hamano
2013-11-20 17:34 ` Erik Faye-Lund
2013-09-03 8:16 ` the pager Jeff King
2013-09-03 2:37 ` Dale R. Worley
2013-09-03 8:01 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131120173054.GA15339@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kusmabite@gmail.com \
--cc=worley@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).