summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-27 19:16:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-27 19:16:21 (GMT)
commit61061abba7d60f555e97a22ab5775a9d53db1660 (patch)
tree85b38a1b4e668ce6d19e2b6a35e75cc04b77f833 /Makefile
parent936d1b989416a95f593bf81ccae8ac62cd83f279 (diff)
parentf4371a883fa2d740d6b3cd436f62c9b56f13432e (diff)
downloadgit-61061abba7d60f555e97a22ab5775a9d53db1660.zip
git-61061abba7d60f555e97a22ab5775a9d53db1660.tar.gz
git-61061abba7d60f555e97a22ab5775a9d53db1660.tar.bz2
Merge branch 'jh/object-filtering'
In preparation for implementing narrow/partial clone, the object walking machinery has been taught a way to tell it to "filter" some objects from enumeration. * jh/object-filtering: rev-list: support --no-filter argument list-objects-filter-options: support --no-filter list-objects-filter-options: fix 'keword' typo in comment pack-objects: add list-objects filtering rev-list: add list-objects filtering support list-objects: filter objects in traverse_commit_list oidset: add iterator methods to oidset oidmap: add oidmap iterator methods dir: allow exclusions from blob in addition to file
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9dc5a58..80e0674 100644
--- a/Makefile
+++ b/Makefile
@@ -811,6 +811,8 @@ LIB_OBJS += levenshtein.o
LIB_OBJS += line-log.o
LIB_OBJS += line-range.o
LIB_OBJS += list-objects.o
+LIB_OBJS += list-objects-filter.o
+LIB_OBJS += list-objects-filter-options.o
LIB_OBJS += ll-merge.o
LIB_OBJS += lockfile.o
LIB_OBJS += log-tree.o