Merge branch 'jc/worktree-config'

diff --git a/sha1_file.c b/sha1_file.c
index 66dccaaf149c45e40b0e642045ea88dab66b19f0..b9c1fa3f1a0c24fa411d590987b60362cae6f943 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2260,11 +2260,11 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
        void *base, unsigned long base_size, enum object_type type)
 {
        struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
-       struct list_head *lru;
+       struct list_head *lru, *tmp;
 
        delta_base_cached += base_size;
 
-       list_for_each(lru, &delta_base_cache_lru) {
+       list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
                struct delta_base_cache_entry *f =
                        list_entry(lru, struct delta_base_cache_entry, lru);
                if (delta_base_cached <= delta_base_cache_limit)