diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-11 18:47:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 18:47:30 -0800 |
| commit | 30aa4fb15fa408596dea59cdc9f00c94eeaa69f1 (patch) | |
| tree | a52e476cf2c87ab65f06c567424a1859a7f52ee2 /sha1_file.c | |
| parent | 0ea29cce4d099d2fa6613ec66c080776cfe869d5 (diff) | |
| parent | e5887c1bda12b31ea7af0ce798bfdee308e1b176 (diff) | |
| download | git-30aa4fb15fa408596dea59cdc9f00c94eeaa69f1.tar.gz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.1.4.
Make repack less likely to corrupt repository
fast-export: ensure we traverse commits in topological order
Clear the delta base cache if a pack is rebuilt
Conflicts:
RelNotes
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 7459a9cd82..5b6e0f61fa 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -689,6 +689,7 @@ void free_pack_by_name(const char *pack_name) while (*pp) { p = *pp; if (strcmp(pack_name, p->pack_name) == 0) { + clear_delta_base_cache(); close_pack_windows(p); if (p->pack_fd != -1) close(p->pack_fd); |