Merge branch 'ot/mru-on-list'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 6c71552cdf994c4e65cb5495d133494371529f80..0c3d03de487e1645a11d379dc5966cd9b2be81dd 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1009,8 +1009,8 @@ static int want_object_in_pack(const struct object_id *oid,
                               struct packed_git **found_pack,
                               off_t *found_offset)
 {
-       struct mru_entry *entry;
        int want;
+       struct list_head *pos;
 
        if (!exclude && local && has_loose_object_nonlocal(oid->hash))
                return 0;
@@ -1026,7 +1026,8 @@ static int want_object_in_pack(const struct object_id *oid,
                        return want;
        }
 
-       for (entry = packed_git_mru.head; entry; entry = entry->next) {
+       list_for_each(pos, &packed_git_mru.list) {
+               struct mru *entry = list_entry(pos, struct mru, list);
                struct packed_git *p = entry->item;
                off_t offset;