Skip to content

Commit

Permalink
Delay pager setup in git blame
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Hommey authored and Junio C Hamano committed Nov 4, 2007
1 parent a055422 commit b92565d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin-blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b92565d

Please sign in to comment.