From: Alex Riesen Date: Mon, 21 Jul 2008 21:28:49 +0000 (+0200) Subject: Allow pager of diff command be enabled/disabled X-Git-Tag: v1.6.0-rc1~74 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f0359f0a611fef9840218ba61162e9916124e89;p=git.git Allow pager of diff command be enabled/disabled 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-diff.c b/builtin-diff.c index faaa85a1d..7ffea9750 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 0e605d4f4..f3502d305 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);