diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-10 15:32:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-10 15:32:26 -0800 |
| commit | 9b27ea95189b1f276c9f7e10df81fa1476a4ad4d (patch) | |
| tree | 8116ae20f73dc9596be6be72628012b699680056 | |
| parent | 7e1100e9e939c9178b2aa3969349e9e8d34488bf (diff) | |
| parent | 3d20c636af05c44a6ff4df9309c2bca108ee149b (diff) | |
| download | git-9b27ea95189b1f276c9f7e10df81fa1476a4ad4d.tar.gz git-9b27ea95189b1f276c9f7e10df81fa1476a4ad4d.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Clear the delta base cache during fast-import checkpoint
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | fast-import.c | 1 | ||||
| -rw-r--r-- | sha1_file.c | 7 |
3 files changed, 9 insertions, 0 deletions
@@ -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 f0e08aca7..23e970d58 100644 --- 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 ced33e837..d64f28f8c 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) { |