[PATCH] git-blame --incremental: don't use pager
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Jan 28, 2007, 14:25 UTC
- Message-ID
- <45BCB273.7010601@lsrfire.ath.cx>
- In-Reply-To
- <7vps8zfqlx.fsf@assigned-by-dhcp.cox.net>
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 <rene.scharfe@lsrfire.ath.cx> ---
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 },