From: Junio C Hamano <gitster@pobox.com>
To: Tiago Botelho <tiagonbotelho@gmail.com>
Cc: git@vger.kernel.org, christian.couder@gmail.com,
johannes.schindelin@gmx.de, haraldnordgren@gmail.com,
Tiago Botelho <tiagonbotelho@hotmail.com>
Subject: Re: [RFC PATCH v4] Implement --first-parent for git rev-list --bisect
Date: Mon, 28 May 2018 22:25:27 +0900 [thread overview]
Message-ID: <xmqqzi0jj4jc.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180528092017.19022-1-tiagonbotelho@hotmail.com> (Tiago Botelho's message of "Mon, 28 May 2018 10:20:17 +0100")
Tiago Botelho <tiagonbotelho@gmail.com> writes:
> diff --git a/bisect.c b/bisect.c
> index 4eafc8262..e58cb8d62 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -33,6 +33,8 @@ static const char *term_good;
> *
> * We care just barely enough to avoid recursing for
> * non-merge entries.
> + *
> + * Note: This function does not support the usage --first-parent.
> */
Hmph, is this because we know --first-parent codepath currently does
not call this function, so we do not bother to prepare this function
to be called from --first-parent codepath?
I am not saying that we must prepare this function to be callable
with --first-parent; if I have to wonder why the above comment is
there and what it is trying to say, I suspect most other readers
would, too, so...
> diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
> index a66140803..774d9a4fd 100755
> --- a/t/t6002-rev-list-bisect.sh
> +++ b/t/t6002-rev-list-bisect.sh
> @@ -263,4 +263,41 @@ test_expect_success 'rev-parse --bisect can default to good/bad refs' '
> test_cmp expect.sorted actual.sorted
> '
>
> +# We generate the following commit graph:
> +#
> +# B - C
> +# / \
> +# A FX
> +# \ /
> +# D - EX
> +
> +test_expect_success 'setup' '
> + test_commit A &&
> + test_commit B &&
> + test_commit C &&
> + git reset --hard A &&
> + test_commit D &&
> + test_commit EX &&
> + test_merge FX C
> +'
> +
> +test_output_expect_success "--bisect --first-parent" 'git rev-list --bisect --first-parent FX ^A' <<EOF
> +$(git rev-parse EX)
> +EOF
> +
> +test_output_expect_success "--bisect-vars --first-parent" 'git rev-list --bisect-vars --first-parent FX ^A' <<EOF
> +bisect_rev='$(git rev-parse EX)'
> +bisect_nr=1
> +bisect_good=0
> +bisect_bad=1
> +bisect_all=3
> +bisect_steps=1
> +EOF
> +
> +test_output_expect_success "--bisect-all --first-parent" 'git rev-list --bisect-all --first-parent FX ^A' <<EOF
> +$(git rev-parse EX) (dist=1)
> +$(git rev-parse D) (dist=1)
> +$(git rev-parse FX) (dist=0)
> +EOF
> +
These are all good basic tests, but can you come up with a test that
demonstrates breakage in the previous round that has been fixed in
this version of the patch?
Thanks.
next prev parent reply other threads:[~2018-05-28 13:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-28 9:20 [RFC PATCH v4] Implement --first-parent for git rev-list --bisect Tiago Botelho
2018-05-28 13:25 ` Junio C Hamano [this message]
2018-05-28 14:25 ` Junio C Hamano
2018-05-28 16:49 ` Tiago Botelho
2018-05-28 21:51 ` 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=xmqqzi0jj4jc.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=haraldnordgren@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=tiagonbotelho@gmail.com \
--cc=tiagonbotelho@hotmail.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).