Browse Source

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>
maint
Mike Hommey 17 years ago committed by Junio C Hamano
parent
commit
b92565dc5c
  1. 6
      builtin-blame.c

6
builtin-blame.c

@ -2231,9 +2231,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix) @@ -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) @@ -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)

Loading…
Cancel
Save