From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>,
Oded S via GitGitGadget <gitgitgadget@gmail.com>,
Oded S <oded@istraresearch.com>
Subject: Re: [PATCH] Fix git-bisect when show-branch is configured to run with pager
Date: Wed, 28 Jul 2021 08:37:01 +0200 [thread overview]
Message-ID: <CAP8UFD26AXTYPvSzBD1x6hSvK5SNbM0F5BPX5bLEbxUZa2dAUg@mail.gmail.com> (raw)
In-Reply-To: <xmqq7dhbehwl.fsf@gitster.g>
On Tue, Jul 27, 2021 at 8:26 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Also, in the longer term, I suspect that we probably should stop
> > calling show-branch from this codepath and here is why.
>
> I wonder if it is just a simple matter of a few lines of code, like
> this?
Yeah, I also think it's a good idea.
> ---- >8 ------- >8 ------- >8 ------- >8 ------- >8 ----
> Subject: [PATCH] bisect: do not run show-branch just to show the current commit
>
> In scripted versions of "git bisect", we used "git show-branch" to
> describe single commit in the bisect log and also to the interactive
s/single/ a single/
> user after checking out the next version to be tested.
[...]
> diff --git a/bisect.c b/bisect.c
> index af2863d044..2b8b6546e9 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -23,7 +23,6 @@ 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 *term_bad;
> static const char *term_good;
> @@ -729,6 +728,9 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
> {
> char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
> enum bisect_error res = BISECT_OK;
> + struct commit *commit;
> + struct pretty_print_context pp = {0};
> + struct strbuf commit_msg = STRBUF_INIT;
>
> oid_to_hex_r(bisect_rev_hex, bisect_rev);
> update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
> @@ -748,13 +750,11 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
> return -abs(res);
> }
>
> - argv_show_branch[1] = bisect_rev_hex;
> - res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
> - /*
> - * Errors in `run_command()` itself, signaled by res < 0,
> - * and errors in the child process, signaled by res > 0
> - * can both be treated as regular BISECT_FAILURE (-1).
> - */
> + commit = lookup_commit_reference(the_repository, bisect_rev);
> + format_commit_message(commit, "[%H] %s%n", &commit_msg, &pp);
> + fputs(commit_msg.buf, stdout);
> + strbuf_release(&commit_msg);
> +
> return -abs(res);
Nice! Now, the above line can be simplified to:
return BISECT_OK;
And the declaration of the `res` variable can be moved into the else
clause where it is used.
> }
next prev parent reply other threads:[~2021-07-28 6:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 15:00 [PATCH] Fix git-bisect when show-branch is configured to run with pager Oded S via GitGitGadget
2021-07-26 18:13 ` 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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAP8UFD26AXTYPvSzBD1x6hSvK5SNbM0F5BPX5bLEbxUZa2dAUg@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).