[PATCH] git-blame --incremental: don't use pager
From: René Scharfe <hidden>
Date: 2016-06-15 22:42:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] git-blame --incremental: don't use pager · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] git-blame --incremental: don't use pager · René Scharfe <hidden>
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 <redacted> --- builtin-blame.c | 3 +++ git.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index 7a58ee3..02bda5e 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 530e99f..e9febc3 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 },