]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/object-filter-with-bitmap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2020 23:07:18 +0000 (15:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2020 23:07:18 +0000 (15:07 -0800)
commit0df82d99dae85dbd4f667e95020a146ea0167975
treeb5af782c64f9515ca57938b5bbb1414bc9e14ead
parent80648bb3f2353bc90bec12e9dcbb0ba3e2032a72
parent20a5fd881a98cfe153fa5a81754994c7046a6e41
Merge branch 'jk/object-filter-with-bitmap'

The object reachability bitmap machinery and the partial cloning
machinery were not prepared to work well together, because some
object-filtering criteria that partial clones use inherently rely
on object traversal, but the bitmap machinery is an optimization
to bypass that object traversal.  There however are some cases
where they can work together, and they were taught about them.

* jk/object-filter-with-bitmap:
  rev-list --count: comment on the use of count_right++
  pack-objects: support filters with bitmaps
  pack-bitmap: implement BLOB_LIMIT filtering
  pack-bitmap: implement BLOB_NONE filtering
  bitmap: add bitmap_unset() function
  rev-list: use bitmap filters for traversal
  pack-bitmap: basic noop bitmap filter infrastructure
  rev-list: allow commit-only bitmap traversals
  t5310: factor out bitmap traversal comparison
  rev-list: allow bitmaps when counting objects
  rev-list: make --count work with --objects
  rev-list: factor out bitmap-optimized routines
  pack-bitmap: refuse to do a bitmap traversal with pathspecs
  rev-list: fallback to non-bitmap traversal when filtering
  pack-bitmap: fix leak of haves/wants object lists
  pack-bitmap: factor out type iterator initialization
builtin/pack-objects.c
ewah/bitmap.c
ewah/ewok.h
object.c
pack-bitmap.c
pack-bitmap.h
t/t6000-rev-list-misc.sh