Luben Tuikov <ltuikov@xxxxxxxxx> wrote: > > Junio C Hamano <junkio@xxxxxxx> writes: > > 1510fe is buggy and it is my fault. > > > > For now, this _should_ get you keep going. > > > > However, if this fixes it for you, that means we would still > > have the problem on Cygwin X-<. > > Yep -- that fixed it. It might be a problem on Cygwin. :-) I completely fail to see how this patch would cause a segfault downstream in xdl_merge. All this controls is do we mmap data from the working directory or decompress it from the ODB. Either way we should have loaded the file size or content into the diff_filespec. My other related change (7da41f48c) in this area has a better chance of causing a problem as it may be bypassing loading the file content into the diff_filespec where before we were always loading it. However none of my testing ever showed that would cause a problem. -- Shawn. - 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