Clear the delta base cache during fast-import checkpoint

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 88035a0cd19d040c8b626684c3ff1f7fdb35e837..cbcae24d28f7000d2e55c4a2ef95026f07c5e5cc 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1630,6 +1630,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)
 {
@@ -2280,7 +2287,8 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
 static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
                              void *buf, unsigned long len, time_t mtime)
 {
-       int fd, size, ret;
+       int fd, ret;
+       size_t size;
        unsigned char *compressed;
        z_stream stream;
        char *filename;