Merge branch 'js/fetchconfig' into next

diff --git a/cache-tree.h b/cache-tree.h
index 5d824df2ec3d94124fe3da3be43bcfbac871cdb8..72c64801f5e16d1e5d03dab505a388138dfcd8ab 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -26,6 +26,6 @@ void *cache_tree_write(struct cache_tree *root, unsigned long *size_p);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
 int cache_tree_fully_valid(struct cache_tree *);
-int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int);
+int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
 
 #endif