git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Schwab <schwab@linux-m68k.org>
To: Florian Bruhin <me@the-compiler.org>
Cc: git@vger.kernel.org, r.seitz@beh.ch
Subject: Re: git bisect with temporary commits
Date: Mon, 14 Dec 2015 19:08:48 +0100	[thread overview]
Message-ID: <87si34hphr.fsf@igel.home> (raw)
In-Reply-To: <20151214163726.GY13519@tonks> (Florian Bruhin's message of "Mon, 14 Dec 2015 17:37:26 +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.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

  reply	other threads:[~2015-12-14 18:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-14 16:37 git bisect with temporary commits Florian Bruhin
2015-12-14 18:08 ` Andreas Schwab [this message]
2015-12-14 18:22   ` Florian Bruhin
2015-12-14 19:21     ` Junio C Hamano
2015-12-14 19:38       ` Florian Bruhin
2015-12-14 20:17     ` Andreas Schwab
2015-12-14 21:09   ` Jeff King
2015-12-14 21:17     ` Junio C Hamano
2015-12-14 21:26       ` Jeff King

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=87si34hphr.fsf@igel.home \
    --to=schwab@linux-m68k.org \
    --cc=git@vger.kernel.org \
    --cc=me@the-compiler.org \
    --cc=r.seitz@beh.ch \
    /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).