From: Mike Hommey <mh@glandium.org>
Date: Sat, 3 Nov 2007 12:22:53 +0000 (+0100)
Subject: Delay pager setup in git blame
X-Git-Tag: v1.5.3.6~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b92565dc5c505c3d01f3219fb7f61ebc70630a2c;p=git.git

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 dc88a953a..e17b03d87 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)