From: Alex Riesen Date: Mon, 21 Jul 2008 21:28:49 GMT Subject: [PATCH] Allow pager of diff command be enabled/disabled Message-ID: <20080721212849.GB4748@blimp.local> See for example, status and show commands. Besides, Documentation/RelNotes-1.6.0.txt mentions that pager. can be used to enable/disable paging behavior per command. Signed-off-by: Alex Riesen --- Also, really export check_pager_config, which just got another call site. builtin-diff.c | 3 ++- builtin.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/builtin-diff.c b/builtin-diff.c index faaa85a..7ffea97 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -296,7 +296,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix) * If the user asked for our exit code then don't start a * pager or we would end up reporting its exit code instead. */ - if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS)) + if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) && + check_pager_config("diff") != 0) setup_pager(); /* diff --git a/builtin.h b/builtin.h index 0e605d4..f3502d3 100644 --- a/builtin.h +++ b/builtin.h @@ -18,6 +18,7 @@ extern int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out); extern int commit_tree(const char *msg, unsigned char *tree, struct commit_list *parents, unsigned char *ret); +extern int check_pager_config(const char *cmd); extern int cmd_add(int argc, const char **argv, const char *prefix); extern int cmd_annotate(int argc, const char **argv, const char *prefix); -- 1.6.0.rc0.24.g1329.dirty