Merge branch 'ot/mru-on-list'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:05 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:05 +0000 (13:39 -0800)
The first step to getting rid of mru API and using the
doubly-linked list API directly instead.

* ot/mru-on-list:
mru: use double-linked list from list.h

1  2 
builtin/pack-objects.c
packfile.c
index 6c71552cdf994c4e65cb5495d133494371529f80,ba812349e0aab35c2a009fe3c7da407ec8b7f48c..0c3d03de487e1645a11d379dc5966cd9b2be81dd
@@@ -1009,10 -995,10 +1009,10 @@@ static int want_object_in_pack(const st
                               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(sha1))
 +      if (!exclude && local && has_loose_object_nonlocal(oid->hash))
                return 0;
  
        /*
diff --cc packfile.c
Simple merge