merge-recursive: improve add_cacheinfo error handling