[PATCH] pager: environment variable GIT_PAGER to override PAGER
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 17 quoted lines
> Hi,
>
> On Mon, 31 Jul 2006, Matthias Lederhofer wrote:
>
> > Signed-off-by: Matthias Lederhofer <matled@gmx.net>
>
> The commit message no longer reflects what the patch does ;-)
>
> > - const char *pager = getenv("PAGER");
> > + char *pager;
>
> You do not need to lose the "const" (it means that you cannot access the
> memory it points to, but you can change the pointer). Also, you could make
> a more minimal patch by replacing PAGER by GIT_PAGER here, instead of
> having this extra line:
>
> > + pager = getenv("GIT_PAGER");Thanks, I should be more careful when correcting a patch with
--amend.
---
Documentation/git.txt | 3 +++
pager.c | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7310a2b..d243883 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -627,6 +627,9 @@ git Diffs
other
~~~~~
+'GIT_PAGER'::
+ This environment variable overrides `$PAGER`.
+
'GIT_TRACE'::
If this variable is set git will print `trace:` messages on
stderr telling about alias expansion, built-in command
diff --git a/pager.c b/pager.c
index 280f57f..dcb398d 100644
--- a/pager.c
+++ b/pager.c
@@ -15,11 +15,13 @@ void setup_pager(void)
{
pid_t pid;
int fd[2];
- const char *pager = getenv("PAGER");
+ 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;
--
1.4.2.rc2.g91b7