From: Mark E Mason <mark.e.mason@broadcom.com>
Date: Thu, 09 Feb 2006 19:59:45 GMT
Subject: RE: Fatal error from git bisect
Message-ID: <7E000E7F06B05C49BDBB769ADAF44D0773A4A8@NT-SJCA-0750.brcm.ad.broadcom.com>

Hello!
 
> From: Linus Torvalds [mailto:torvalds@osdl.org] 
[snip]
> On Thu, 9 Feb 2006, Mark E Mason wrote:
> >  
> > I'm trying to use 'git bisect' and am running into the 
> following error:
> >
> > fatal: Entry 'block/elevator.c' would be overwritten by 
> merge. Cannot merge.
> 
> This seems to mean that you have a dirty block/elevator.c 
> file. Have you perhaps edited it?

I thought of that, but even removing the workspace file doesn't get
around this:

[mason@hawaii linux.git]$ git bisect reset
[mason@hawaii linux.git]$ git bisect start
[mason@hawaii linux.git]$ git bisect good
d166b5a220813a08a79312fc384d11e1c57e9072
[mason@hawaii linux.git]$ git bisect bad
a7900c9bdb64c11688719bef9f6373fbc4c276ab
Bisecting: 116 revisions left to test after this
fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot
merge.
[mason@hawaii linux.git]$ rm block/elevator.c
[mason@hawaii linux.git]$ git bisect bad
a7900c9bdb64c11688719bef9f6373fbc4c276ab
Bisecting: 116 revisions left to test after this
fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot
merge.

I've made no commits to this tree - it's just an up-to-date pull of the
linux-mips.org tree.  I also have no local edits at this point.

[mason@hawaii linux.git]$ git diff
[mason@hawaii linux.git]$

What's puzzling me is that (as I understand it) git bisect simply
manipulates the workspace, not the repository.

Thanks!
Mark