git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: git <git@vger.kernel.org>,
	Christian Couder <chriscool@tuxfamily.org>,
	Pranit Bauva <pranit.bauva@gmail.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Junio C Hamano <gitster@pobox.com>,
	Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Trygve Aaberge <trygveaa@gmail.com>
Subject: Re: [PATCH v4] t6030: add test for git bisect skip started with --term* arguments
Date: Thu, 29 Apr 2021 10:05:11 +0200	[thread overview]
Message-ID: <CAP8UFD23Wvm-SpoAoFZZWXfXO_KGPdT5vwa4gWXMbtgL66me=w@mail.gmail.com> (raw)
In-Reply-To: <20210429072451.38422-1-bagasdotme@gmail.com>

On Thu, Apr 29, 2021 at 9:25 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> Trygve Aaberge reported git bisect breakage when the bisection
> is started with --term* arguments (--term-new and --term-old).

Sorry if my previous comment was not clear about it, but I think it's
enough to mention Trygve in a "Reported-by:" trailer below.

One thing that might be interesting to tell is that the breakage was
introduced by the following commit:

e4c7b33747 (bisect--helper: reimplement `bisect_skip` shell function
in C, 2021-02-03)

So maybe:

"Since e4c7b33747 (bisect--helper: reimplement `bisect_skip` shell
function in C, 2021-02-03), `git bisect skip` has been broken when the
bisection is started with --term* arguments (--term-new and
--term-old)."

> For example, suppose that we have repository with 10 commits, and we
> start the bisection from HEAD to first commit (HEAD~9) with:
>
>   $ git bisect start --term-new=fixed --term-old=unfixed HEAD HEAD~9
>
> The bisection then stopped at HEAD~5 (fifth commit), and we choose
> to skip (git bisect skip). The HEAD should now at HEAD~4 (sixth commit).
> In the breakage, however, the HEAD after skipping stayed at HEAD~5
> (not changed). The breakage is caused by forgetting to read '.git/BISECT_TERMS' during implementation of `'bisect skip' subcommand in C.
>
> The fix is in commit 002241336f (bisect--helper: use BISECT_TERMS in
> 'bisect skip' command, 2021-04-25). To verify it fixes the breakage, add
> the test.

I am not sure how safe it is to use the hash of a commit that is in
seen but not yet in next. I suggested using "a previous commit"
instead as I thought that both the fix and this commit should be part
of the same branch, and then it would be obvious which commit it is.
Maybe we should wait for Junio to come back from vacation and decide
about this.

> Reported-by: Trygve Aaberge <trygveaa@gmail.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

Thanks!

  reply	other threads:[~2021-04-29  8:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-29  7:24 Bagas Sanjaya
2021-04-29  8:05 ` Christian Couder [this message]
2021-04-29  8:20   ` 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='CAP8UFD23Wvm-SpoAoFZZWXfXO_KGPdT5vwa4gWXMbtgL66me=w@mail.gmail.com' \
    --to=christian.couder@gmail.com \
    --cc=bagasdotme@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pranit.bauva@gmail.com \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sunshine@sunshineco.com \
    --cc=trygveaa@gmail.com \
    --subject='Re: [PATCH v4] t6030: add test for git bisect skip started with --term* arguments' \
    /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

Code repositories for project(s) associated with this 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).