Re: Bisecting through the middle of a big merge?

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Jan 28, 2012, 08:55 UTC
Message-ID: <m239b0fbpb.fsf@igel.home>
In-Reply-To: <jfve09$ih5$1@dough.gmane.org>

walt <w41ter@gmail.com> writes:

Show 11 quoted lines

> There are many individual commits from Tejun Heo et al included
> in that one big commit from Linus.  Unfortunately for me, some of
> those commits cause other problems that I'm not trying to bisect;
> other problems that evidently get fixed by other commits in the
> same big merge.
>
> So I do 'git bisect skip' six or eight times until the 'false' bug
> goes away, and that leaves me at the end of the bisect without finding
> the individual commit that's causing my 'real' bug.
>
> How do you experts handle this kind of problem?

If you can identify the commit that fixes the unrelated problem you can try to cherry-pick it during the bisect.

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."