From: Ren,Ai(B Scharfe Date: Sun, 28 Jan 2007 14:25:55 +0000 (+0100) Subject: git-blame --incremental: don't use pager X-Git-Tag: v1.5.0-rc3~33 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f0219a4c76a2ce963cf355f90f18c9c59036bca;p=git.git git-blame --incremental: don't use pager Starting a pager defeats the purpose of the incremental output mode. This changes git-blame to only paginate if --incremental was not given. git -p blame --incremental still starts the pager, though. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- diff --git a/builtin-blame.c b/builtin-blame.c index 7a58ee303..02bda5e19 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -1780,6 +1780,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix) argv[unk++] = arg; } + if (!incremental) + setup_pager(); + if (!blame_move_score) blame_move_score = BLAME_DEFAULT_MOVE_SCORE; if (!blame_copy_score) diff --git a/git.c b/git.c index 530e99fe6..e9febc389 100644 --- a/git.c +++ b/git.c @@ -217,7 +217,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "annotate", cmd_annotate, USE_PAGER }, { "apply", cmd_apply }, { "archive", cmd_archive }, - { "blame", cmd_blame, RUN_SETUP | USE_PAGER }, + { "blame", cmd_blame, RUN_SETUP }, { "branch", cmd_branch, RUN_SETUP }, { "cat-file", cmd_cat_file, RUN_SETUP }, { "checkout-index", cmd_checkout_index, RUN_SETUP },