Merge branch 'rs/archive-excluded-directory' into next

diff --git a/cache.h b/cache.h
index 379f88d454074671dd185a91bf19769c7269e5f7..6ef99e7486c3bc1e3f5bd7e7510c9d201a9a30d6 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1544,7 +1544,6 @@ extern struct alternate_object_database {
        char path[FLEX_ARRAY];
 } *alt_odb_list;
 extern void prepare_alt_odb(void);
-extern void read_info_alternates(const char * relative_base, int depth);
 extern char *compute_alternate_path(const char *path, struct strbuf *err);
 typedef int alt_odb_fn(struct alternate_object_database *, void *);
 extern int foreach_alt_odb(alt_odb_fn, void*);