From: "Oded S via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Oded S <oded@istraresearch.com>, Oded Shimon <oded@istraresearch.com>
Subject: [PATCH] Fix git-bisect when show-branch is configured to run with pager
Date: Mon, 26 Jul 2021 15:00:59 +0000 [thread overview]
Message-ID: <pull.1003.git.1627311659384.gitgitgadget@gmail.com> (raw)
From: Oded Shimon <oded@istraresearch.com>
Signed-off-by: Oded Shimon <oded@istraresearch.com>
---
Fix git-bisect when show-branch is configured to run with pager
Signed-off-by: Oded Shimon oded@istraresearch.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1003%2Foded-ist%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1003/oded-ist/master-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1003
bisect.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index af2863d044b..c02bcc3359f 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,
base-commit: eb27b338a3e71c7c4079fbac8aeae3f8fbb5c687
--
gitgitgadget
next reply other threads:[~2021-07-26 15:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 15:00 Oded S via GitGitGadget [this message]
2021-07-26 18:13 ` [PATCH] Fix git-bisect when show-branch is configured to run with pager Christian Couder
2021-07-26 18:39 ` Junio C Hamano
2021-07-27 18:22 ` Junio C Hamano
2021-07-28 6:37 ` Christian Couder
2021-07-28 16:41 ` Junio C Hamano
2021-07-28 17:07 ` Re* " Junio C Hamano
2021-07-29 2:34 ` Christian Couder
2021-07-27 8:12 ` [PATCH v2] bisect: disable pager while invoking show-branch Oded S via GitGitGadget
2021-07-27 18:29 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1003.git.1627311659384.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=oded@istraresearch.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).