Merge branch 'sb/sha1-file-cleanup' into maint

diff --git a/cache.h b/cache.h
index ee2db602bc1478e833ee6631a658d80594d82379..849bc0dcdd0d6bc572d3524f2646ea7f719eb7a9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1545,7 +1545,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*);