Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
Clear the delta base cache during fast-import checkpoint

diff --git a/cache.h b/cache.h
index 49e54fbe67e264d787cf98befd905faea68d6367..3a33b1e82b0db66fad1e0ce45380c8b847aad15f 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -825,6 +825,7 @@ extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t
 extern void close_pack_windows(struct packed_git *);
 extern void unuse_pack(struct pack_window **);
 extern void free_pack_by_name(const char *);
+extern void clear_delta_base_cache(void);
 extern struct packed_git *add_packed_git(const char *, int, int);
 extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t);
 extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t);

diff --git a/fast-import.c b/fast-import.c
index f0e08aca70c16e9309dde87954593a76ad37b9ef..23e970d581ad00c97ba8ea870c0e43b16258b219 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -944,6 +944,7 @@ static void end_packfile(void)
 {
        struct packed_git *old_p = pack_data, *new_p;
 
+       clear_delta_base_cache();
        if (object_count) {
                char *idx_name;
                int i;

diff --git a/sha1_file.c b/sha1_file.c
index ced33e837b0acc3863ff86d2d0151951d55f6483..d64f28f8ca5aa841fe5db5d81f0fdee8df6618a4 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1663,6 +1663,13 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
        }
 }
 
+void clear_delta_base_cache(void)
+{
+       unsigned long p;
+       for (p = 0; p < MAX_DELTA_CACHE; p++)
+               release_delta_base_cache(&delta_base_cache[p]);
+}
+
 static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
        void *base, unsigned long base_size, enum object_type type)
 {