Merge branch 'bc/blame-doc-fix'

diff --git a/sha1_file.c b/sha1_file.c
index c40ef7111c7f1ce3dfc4478a37512111acf96d90..ec957db5e1c2620b4a95e4f4d028f01794cef02a 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2371,11 +2371,10 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
 
 void clear_delta_base_cache(void)
 {
-       struct hashmap_iter iter;
-       struct delta_base_cache_entry *entry;
-       for (entry = hashmap_iter_first(&delta_base_cache, &iter);
-            entry;
-            entry = hashmap_iter_next(&iter)) {
+       struct list_head *lru, *tmp;
+       list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
+               struct delta_base_cache_entry *entry =
+                       list_entry(lru, struct delta_base_cache_entry, lru);
                release_delta_base_cache(entry);
        }
 }