summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:48:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:48:39 -0700
commit78849622ec58ae576f36b155824e813543a9bdf5 (patch)
tree5b1c92c1beb5bfdd6072c31e8ba85d541ac2146a /Makefile
parentMerge branch 'jk/difftool-in-subdir' (diff)
parentpack-objects: compute local/ignore_pack_keep early (diff)
downloadtgif-78849622ec58ae576f36b155824e813543a9bdf5.tar.xz
Merge branch 'jk/pack-objects-optim'
"git pack-objects" has a few options that tell it not to pack objects found in certain packfiles, which require it to scan .idx files of all available packs. The codepaths involved in these operations have been optimized for a common case of not having any non-local pack and/or any .kept pack. * jk/pack-objects-optim: pack-objects: compute local/ignore_pack_keep early pack-objects: break out of want_object loop early find_pack_entry: replace last_found_pack with MRU cache add generic most-recently-used list sha1_file: drop free_pack_by_name t/perf: add tests for many-pack scenarios
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6a13386c27..ad3624d95b 100644
--- a/Makefile
+++ b/Makefile
@@ -755,6 +755,7 @@ LIB_OBJS += merge.o
LIB_OBJS += merge-blobs.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += mergesort.o
+LIB_OBJS += mru.o
LIB_OBJS += name-hash.o
LIB_OBJS += notes.o
LIB_OBJS += notes-cache.o