From: Junio C Hamano Date: Wed, 7 Feb 2018 22:55:49 +0000 (-0800) Subject: Merge branch 'ot/mru-on-list' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ee1ee4ac7997dac8e679a0128bffb436e07e5e8d Merge branch 'ot/mru-on-list' into next 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 --- ee1ee4ac7997dac8e679a0128bffb436e07e5e8d diff --cc builtin/pack-objects.c index 6c71552cdf,ba812349e0..0c3d03de48 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@@ -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; /*