From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2009 05:30:45 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc1~44
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/fd8475d9fb76fbc435ba5dc5b7e97b0cad92661d?hp=f6b98e46bdf64454d7c6ab76d617237118799d7b

Merge branch 'maint'

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

diff --git a/cache.h b/cache.h
index 2d889deb26..d8ba693146 100644
--- a/cache.h
+++ b/cache.h
@@ -830,6 +830,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 1935206be0..03b13e0621 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -945,6 +945,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 8868b800cb..7459a9cd82 100644
--- 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)
 {