On Mon, Feb 20, 2012 at 09:36:44PM +0700, Nguyen Thai Ngoc Duy wrote: > > test_expect_failure 'checkout gives cache-tree' ' > > git checkout HEAD^ && > > test_shallow_cache_tree > > ' > > > > ;-) > > Quick and dirty that passes that test. I think we could do better if > we analyse two way merge rules carefully and avoid this diff, but > that's too much for me right now. Unpack trees is already sprinkled with cache_tree_invalidate_path. But something seems to throw away the cache tree entirely (I think it may be that the extension simply isn't copied over to the destination index). I'm walking through it right now. -Peff -- 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