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

Re: git bisect with temporary commits

From
FBFlorian Bruhin <me@the-compiler.org>
Date
Dec 14, 2015, 19:38 UTC
Message-ID
<20151214193802.GD13519@tonks>
In-Reply-To
<xmqqa8pckfa5.fsf@gitster.mtv.corp.google.com>
* Junio C Hamano <gitster@pobox.com> [2015-12-14 11:21:06 -0800]:
Show 31 quoted lines
> Florian Bruhin <me@the-compiler.org> writes:
> 
> > * Andreas Schwab <schwab@linux-m68k.org> [2015-12-14 19:08:48 +0100]:
> >> Florian Bruhin <me@the-compiler.org> writes:
> >> 
> >> > Now when trying to say it's good (and forgetting to remove the
> >> > temporary commits), I get this:
> >> >
> >> >     $ git bisect good
> >> >     Bisecting: a merge base must be tested
> >> >     [981e1093dae24b37189bcba2dd848b0c3388080c] still good and does not compile
> >> >
> >> > Is this intended behaviour? Shouldn't git either do a reset to the
> >> > commit we're currently bisecting, or warn the user as it was probably
> >> > unintended to add new commits?
> >> 
> >> You should instead tell git that HEAD^ is good, since that is what git
> >> asked you to test.
> >
> > I see - but wouldn't it make more sense for a "git bisect good" (or
> > bad, respectively) without arguments to assume I mean the commit
> > bisect checked out for me, not HEAD?
> >
> > I don't see any scenario where the current behaviour would make sense,
> > but I might be missing something.
> 
> When the commit "bisect" checked out is untestable, the user can
> freely go to another commit, e.g. "git reset --hard HEAD^" to go
> back one step, and then test it instead.  "git bisect good" has
> to mark the then-current HEAD, not the commit that was checked out,
> for this to work.
That makes sense - thanks for the explanation!
Florian
-- 
http://www.the-compiler.org | me@the-compiler.org (Mail/XMPP)
   GPG: 916E B0C8 FD55 A072 | http://the-compiler.org/pubkey.asc
         I love long mails! | http://email.is-not-s.ms/
Previous: Junio C HamanoNext: Andreas Schwab
Message 5 of 9 in “git bisect with temporary commits”
  1. Florian BruhinDec 14, 2015
  2. Andreas SchwabDec 14, 2015
  3. Florian BruhinDec 14, 2015
  4. Junio C HamanoDec 14, 2015
  5. Florian BruhinDec 14, 2015
  6. Andreas SchwabDec 14, 2015
  7. Jeff KingDec 14, 2015
  8. Junio C HamanoDec 14, 2015
  9. Jeff KingDec 14, 2015

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.