From 58e3755ed1e3bf55aead5920c4846a676d682eb2 Mon Sep 17 00:00:00 2001 From: Oded Shimon Date: Tue, 27 Jul 2021 08:12:40 +0000 Subject: [PATCH] bisect: disable pager while invoking show-branch git-bisect uses show-branch for logging during the bisect process. If the user sets an interactive pager for show-branch, this makes bisect hang (wait for user input) unexpectedly - so we disable pager with -P. It's possible that the user would set a pager for git-checkout as well, but an interactive pager there would break many more scripts. Signed-off-by: Oded Shimon Signed-off-by: Junio C Hamano --- bisect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index af2863d044b704..c02bcc3359feba 100644 --- a/bisect.c +++ b/bisect.c @@ -23,7 +23,7 @@ static struct oid_array skipped_revs; static struct object_id *current_bad_oid; static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; -static const char *argv_show_branch[] = {"show-branch", NULL, NULL}; +static const char *argv_show_branch[] = {"-P", "show-branch", NULL, NULL}; static const char *term_bad; static const char *term_good; @@ -748,7 +748,7 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int return -abs(res); } - argv_show_branch[1] = bisect_rev_hex; + argv_show_branch[2] = bisect_rev_hex; res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD); /* * Errors in `run_command()` itself, signaled by res < 0,