On 2007.10.18 10:31:05 +0200, Björn Steinbrink wrote: > On 2007.10.18 02:34:07 -0400, 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. :-\ > > The first merge moved some code from file1 (which doesn't exist in the > branch anymore) into file2, so I guess the code move detection comes > into play here. > > Actually, in the original case that crashed here, I was curious about > some lines in file2 which looked like they had been automatically merged > from file1, so I tried to use git blame with file2 to see if that really > happened (I didn't expect git to be even able to follow code moves while > merging). Unfortunately, I didn't get such a test case yet, which might > indicate that I've only imagined that merge, and thinking about it, I > think that file2 wasn't marked as modified in "git status". Hm, I'll try > to find that merge conflict again and try that again. Nope, didn't succeed in reproducing what I probably just pretend to have seen. Björn - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
