summaryrefslogtreecommitdiff
path: root/builtin-blame.c
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2007-11-03 12:22:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-04 04:31:37 (GMT)
commitb92565dc5c505c3d01f3219fb7f61ebc70630a2c (patch)
treeb82d2bffedf583c6f56805739aa657e6ad9a7961 /builtin-blame.c
parenta0554224a285b73b87fe1c95dbdff469561b182f (diff)
downloadgit-b92565dc5c505c3d01f3219fb7f61ebc70630a2c.zip
git-b92565dc5c505c3d01f3219fb7f61ebc70630a2c.tar.gz
git-b92565dc5c505c3d01f3219fb7f61ebc70630a2c.tar.bz2
Delay pager setup in git blame
This avoids to launch the pager when git blame fails for any reason. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-blame.c')
-rw-r--r--builtin-blame.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index dc88a95..e17b03d 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2231,9 +2231,6 @@ 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)
@@ -2427,6 +2424,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
read_mailmap(&mailmap, ".mailmap", NULL);
+ if (!incremental)
+ setup_pager();
+
assign_blame(&sb, &revs, opt);
if (incremental)