"git -p cmd" to page anywhere

This allows you to say:

git -p diff v2.6.16-rc5..

and the command pipes the output of any git command to your pager.

[jc: this resurrects a month old RFC patch with improvement
suggested by Linus to call it --paginate instead of --less.]

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/cache.h b/cache.h
index 7b5c91c996fc58d7e5f743bdf07739ac1c1487bb..b5e3f8fa21e49e2e209f0edc2e42878368d7d817 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -382,6 +382,7 @@ extern int receive_keep_pack(int fd[2], const char *me, int quiet, int);
 
 /* pager.c */
 extern void setup_pager(void);
+extern int pager_in_use;
 
 /* base85 */
 int decode_85(char *dst, char *line, int linelen);

diff --git a/diff.c b/diff.c
index 3e26180f08204df2e7519e4613aa6e3e844e21b2..a00f9d1e5244c8a7d2edfcef55cb92d3d3df252a 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -112,7 +112,7 @@ int git_diff_config(const char *var, const char *value)
                        diff_use_color_default = 1; /* bool */
                else if (!strcasecmp(value, "auto")) {
                        diff_use_color_default = 0;
-                       if (isatty(1)) {
+                       if (isatty(1) || pager_in_use) {
                                char *term = getenv("TERM");
                                if (term && strcmp(term, "dumb"))
                                        diff_use_color_default = 1;

diff --git a/git.c b/git.c
index 256730112e56e19e5df70f2bef4e3efdb1a5e362..49062ca66e4f37d53f16d4bff10dc71b1c97e6db 100644 (file)
--- a/git.c
+++ b/git.c
@@ -251,6 +251,11 @@ int main(int argc, const char **argv, char **envp)
                cmd = *++argv;
                argc--;
 
+               if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
+                       setup_pager();
+                       continue;
+               }
+
                if (strncmp(cmd, "--", 2))
                        break;
 

diff --git a/pager.c b/pager.c
index 2d186e8bde1067a62c9615e8d7f0368f98442ca4..bb14e99735dd08c31c66325eacdcde4f3f2c685c 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -5,6 +5,8 @@
  * something different on Windows, for example.
  */
 
+int pager_in_use;
+
 static void run_pager(const char *pager)
 {
        execlp(pager, pager, NULL);
@@ -24,6 +26,8 @@ void setup_pager(void)
        else if (!*pager || !strcmp(pager, "cat"))
                return;
 
+       pager_in_use = 1; /* means we are emitting to terminal */
+
        if (pipe(fd) < 0)
                return;
        pid = fork();