From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 May 2021 03:47:40 +0000 (+0900)
Subject: Merge branch 'ps/rev-list-object-type-filter'
X-Git-Tag: v2.32.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8585d6c04aa903526b4b3554e90d6381ec62390a;p=thirdparty%2Fgit.git

Merge branch 'ps/rev-list-object-type-filter'

"git rev-list" learns the "--filter=object:type=<type>" option,
which can be used to exclude objects of the given kind from the
packfile generated by pack-objects.

* ps/rev-list-object-type-filter:
  rev-list: allow filtering of provided items
  pack-bitmap: implement combined filter
  pack-bitmap: implement object type filter
  list-objects: implement object type filter
  list-objects: support filtering by tag and commit
  list-objects: move tag processing into its own function
  revision: mark commit parents as NOT_USER_GIVEN
  uploadpack.txt: document implication of `uploadpackfilter.allow`
---

8585d6c04aa903526b4b3554e90d6381ec62390a
diff --cc pack-bitmap.h
index 78f2b3ff79,bb45217d3b..99d733eb26
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@@ -50,9 -49,9 +50,10 @@@ void traverse_bitmap_commit_list(struc
  				 struct rev_info *revs,
  				 show_reachable_fn show_reachable);
  void test_bitmap_walk(struct rev_info *revs);
 +int test_bitmap_commits(struct repository *r);
  struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
- 					 struct list_objects_filter_options *filter);
+ 					 struct list_objects_filter_options *filter,
+ 					 int filter_provided_objects);
  int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
  				       struct packed_git **packfile,
  				       uint32_t *entries,