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>
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 @@
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 @@
read_mailmap(&mailmap, ".mailmap", NULL);
+ if (!incremental)
+ setup_pager();
+
assign_blame(&sb, &revs, opt);
if (incremental)
