Merge branch 'bc/asciidoc-pretty-formats-fix' into maint

diff --git a/split-index.h b/split-index.h
index 8d7404117e5bc3c9b54ffb46db467b25a105d7e6..c1324f521a87c427c531464c5e6424fe38d7d35b 100644 (file)
--- a/split-index.h
+++ b/split-index.h
@@ -3,15 +3,25 @@
 
 struct index_state;
 struct strbuf;
+struct ewah_bitmap;
 
 struct split_index {
        unsigned char base_sha1[20];
        struct index_state *base;
+       struct ewah_bitmap *delete_bitmap;
+       struct ewah_bitmap *replace_bitmap;
+       struct cache_entry **saved_cache;
        unsigned int saved_cache_nr;
+       unsigned int nr_deletions;
+       unsigned int nr_replacements;
        int refcount;
 };
 
 struct split_index *init_split_index(struct index_state *istate);
+void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
+void replace_index_entry_in_base(struct index_state *istate,
+                                struct cache_entry *old,
+                                struct cache_entry *new);
 int read_link_extension(struct index_state *istate,
                        const void *data, unsigned long sz);
 int write_link_extension(struct strbuf *sb,