On Mon, Dec 14, 2015 at 01:17:03PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> >> You should instead tell git that HEAD^ is good, since that is what git
> >> asked you to test.
> >
> > Another alternative is to use "git cherry-pick -n" to create a working
> > tree state that you can tes
Jeff King writes:
>> You should instead tell git that HEAD^ is good, since that is what git
>> asked you to test.
>
> Another alternative is to use "git cherry-pick -n" to create a working
> tree state that you can test, but leave HEAD at the original commit.
> Then "git bisect good" does the rig
On Mon, Dec 14, 2015 at 07:08:48PM +0100, Andreas Schwab wrote:
> Florian Bruhin 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
> > [981e1093dae24b37
Florian Bruhin writes:
> 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?
The problem is that there is nothing that marks the originally checked
out commit except by being
* Junio C Hamano [2015-12-14 11:21:06 -0800]:
> Florian Bruhin writes:
>
> > * Andreas Schwab [2015-12-14 19:08:48 +0100]:
> >> Florian Bruhin writes:
> >>
> >> > Now when trying to say it's good (and forgetting to remove the
> >> > temporary commits), I get this:
> >> >
> >> > $ git bise
Florian Bruhin writes:
> * Andreas Schwab [2015-12-14 19:08:48 +0100]:
>> Florian Bruhin 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
>> >
* Andreas Schwab [2015-12-14 19:08:48 +0100]:
> Florian Bruhin 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
> > [981e1093dae24b37189bcba2dd848b0c33
Florian Bruhin 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 be
Hi!
Today I bisected a bug which required cherry-picking an (unrelated)
compile fix later in the history so I could test the commits.
After testing a commit, I didn't reset to the commit before the
cherry-picked one, which seemed to work well, but doesn't in my minimal
example:
$ git init
9 matches
Mail list logo