On Fri, 10 Oct 2008, Shawn O. Pearce wrote: > Alex Riesen <raa.lkml@xxxxxxxxx> wrote: > > 2008/10/10 Nicolas Pitre <nico@xxxxxxx>: > > > > > > Since v1.6.0.2~13^2~ the completion of a thin pack uses sha1write() for > > > its ability to compute a SHA1 on the written data. This also provides > > > data buffering which, along with commit 92392b4a45, will confuse pread() > > > whenever an appended object is 1) freed due to memory pressure because > > > of the depth-first delta processing, and 2) needed again because it has > > > many delta children, and 3) its data is still buffered by sha1write(). > > > > BTW, I run into complications trying to test the fix on Shawn's > > master: conflicts, > > and my trivial resolution wasn't good enough. > > Huh. > > Color me confused. What the heck was the base version? > > Near as I can tell Nico wrote this fix against a8032d12 (sha1write: > don't copy full sized buffers). This is in Junio's master. > > But the changes conflict with what is in Junio's maint. So the > patch doesn't apply cleanly due to the sha1flush function's > signature changing. > > And the changes conflict with 9126f009 (fix openssl headers > conflicting with custom SHA1 implementations), which is in my > master, and was written by Nico. > > ;-) Whatever. Your truly is still recovering from a knee surgery and therefore is literally on drugs. > Anyway, its merged now. Thanks. The important thing is that it must be included in what would be v1.6.0.3. Nicolas -- 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
