git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4] t6030: add test for git bisect skip started with --term* arguments

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 29, 2021, 08:05 UTC
Message-ID
<CAP8UFD23Wvm-SpoAoFZZWXfXO_KGPdT5vwa4gWXMbtgL66me=w@mail.gmail.com>
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)."

Show 13 quoted lines
> 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!
Previous: Bagas SanjayaNext: Junio C Hamano
Message 2 of 3 in “t6030: add test for git bisect skip started with --term* arguments”
  1. t6030: add test for git bisect skip started with --term* argumentsBagas Sanjaya, Apr 29, 2021
  2. Christian CouderApr 29, 2021
  3. Junio C HamanoApr 29, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.