summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cache.h1
-rw-r--r--fast-import.c1
-rw-r--r--sha1_file.c7
3 files changed, 9 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 42f2f2754b..099a32e5fc 100644
--- a/cache.h
+++ b/cache.h
@@ -739,6 +739,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 6d5ee6f463..5bc9ce2cc9 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -943,6 +943,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 0cfea9edc1..cbcae24d28 100644
--- 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)
{