From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2022 22:14:24 +0000 (-0700)
Subject: Merge branch 'ds/partial-bundles'
X-Git-Tag: v2.36.0-rc0~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7391ecd338edcd0317687399c915927c1b4e25dd;p=thirdparty%2Fgit.git

Merge branch 'ds/partial-bundles'

Bundle file format gets extended to allow a partial bundle,
filtered by similar criteria you would give when making a
partial/lazy clone.

* ds/partial-bundles:
  clone: fail gracefully when cloning filtered bundle
  bundle: unbundle promisor packs
  bundle: create filtered bundles
  rev-list: move --filter parsing into revision.c
  bundle: parse filter capability
  list-objects: handle NULL function pointers
  MyFirstObjectWalk: update recommended usage
  list-objects: consolidate traverse_commit_list[_filtered]
  pack-bitmap: drop filter in prepare_bitmap_walk()
  pack-objects: use rev.filter when possible
  revision: put object filter into struct rev_info
  list-objects-filter-options: create copy helper
  index-pack: document and test the --promisor option
---

7391ecd338edcd0317687399c915927c1b4e25dd
diff --cc bundle.c
index 7608701a51,56681c2113..e359370cfc
--- a/bundle.c
+++ b/bundle.c
@@@ -255,10 -262,16 +262,16 @@@ int verify_bundle(struct repository *r
  
  		r = &header->references;
  		printf_ln(Q_("The bundle contains this ref:",
 -			     "The bundle contains these %d refs:",
 +			     "The bundle contains these %"PRIuMAX" refs:",
  			     r->nr),
 -			  r->nr);
 +			  (uintmax_t)r->nr);
  		list_refs(r, 0, NULL);
+ 
+ 		if (header->filter.choice) {
+ 			printf_ln("The bundle uses this filter: %s",
+ 				  list_objects_filter_spec(&header->filter));
+ 		}
+ 
  		r = &header->prerequisites;
  		if (!r->nr) {
  			printf_ln(_("The bundle records a complete history."));