diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:30:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:30:45 -0800 |
| commit | fd8475d9fb76fbc435ba5dc5b7e97b0cad92661d (patch) | |
| tree | e60ed01c440abe4ebfe125100bf4c44de1a49b2f | |
| parent | git-web--browse: Fix check for /bin/start (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint (diff) | |
| download | tgif-fd8475d9fb76fbc435ba5dc5b7e97b0cad92661d.tar.xz | |
Merge branch 'maint'
* maint:
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
@@ -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) { |