From: Linus Torvalds Date: Thu, 18 Oct 2007 22:38:23 GMT Subject: Re: [PATCH] git-blame shouldn't crash if run in an unmerged tree Message-ID: In-Reply-To: <20071018063407.GA28861@spearce.org> On Thu, 18 Oct 2007, Shawn O. Pearce wrote: > > I'm applying this patch to my maint tree tonight as it does resolve > the issue for now. What surprised me was the file that we were > crashing out on wasn't even the file we wanted to get the blame > data for. :-\ Please feel free to add a Signed-off-by: there. I guess I didn't add it in the original email, because I wasn't sure if I'd have the energy to see if I could just remove the clearing of "ce_mode". I never did. That whole "ce->ce_mode = 0" thing is really hacky, and we use it for two totally different things ("git read-tree" uses it for "delete this entry", and reading the index uses it when you ask for only merged entries). Bad form, and not very logical. Linus