summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRen,Ai(B Scharfe <rene.scharfe@lsrfire.ath.cx>2007-01-28 14:25:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-28 19:00:57 (GMT)
commit4f0219a4c76a2ce963cf355f90f18c9c59036bca (patch)
treeb72742ee6a735a3cfd3361dd021bd5b89162f6ba
parent1b600e659abc7e409c9d830e332d3cef01062c1c (diff)
downloadgit-4f0219a4c76a2ce963cf355f90f18c9c59036bca.zip
git-4f0219a4c76a2ce963cf355f90f18c9c59036bca.tar.gz
git-4f0219a4c76a2ce963cf355f90f18c9c59036bca.tar.bz2
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.c3
-rw-r--r--git.c2
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 },