diff options
| author | Ren,Ai(B Scharfe <rene.scharfe@lsrfire.ath.cx> | 2007-01-28 15:25:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-28 11:00:57 -0800 |
| commit | 4f0219a4c76a2ce963cf355f90f18c9c59036bca (patch) | |
| tree | b72742ee6a735a3cfd3361dd021bd5b89162f6ba | |
| parent | 1b600e659abc7e409c9d830e332d3cef01062c1c (diff) | |
| download | git-4f0219a4c76a2ce963cf355f90f18c9c59036bca.tar.gz git-4f0219a4c76a2ce963cf355f90f18c9c59036bca.tar.xz | |
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 <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-blame.c | 3 | ||||
| -rw-r--r-- | git.c | 2 |
2 files changed, 4 insertions, 1 deletions
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) @@ -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 }, |