mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gs/retire-mru'

Browse Source 
Retire mru API as it does not give enough abstraction over
underlying list API to be worth it.

* gs/retire-mru:
  mru: Replace mru.[ch] with list.h implementation
This commit is contained in:
Junio C Hamano
2018-02-13 13:39:06 -08:00
parent afc8aa3fbf ec2dd32c70
commit 867622398f
7 changed files with 17 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/pack-objects.c
View File

@ -26,7 +26,7 @@
#include "reachable.h"
#include "sha1-array.h"
#include "argv-array.h"
#include "mru.h"
#include "list.h"
#include "packfile.h"
static const char *pack_usage[] = {
@ -1026,9 +1026,8 @@ static int want_object_in_pack(const struct object_id *oid,
return want;
}
list_for_each(pos, &packed_git_mru.list) {
struct mru *entry = list_entry(pos, struct mru, list);
struct packed_git *p = entry->item;
list_for_each(pos, &packed_git_mru) {
struct packed_git *p = list_entry(pos, struct packed_git, mru);
off_t offset;
if (p == *found_pack)
@ -1045,7 +1044,7 @@ static int want_object_in_pack(const struct object_id *oid,
}
want = want_found_object(exclude, p);
if (!exclude && want > 0)
mru_mark(&packed_git_mru, entry);
list_move(&p->mru, &packed_git_mru);
if (want != -1)
return want;
}