]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/partial-bundles'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2022 22:14:24 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2022 22:14:24 +0000 (15:14 -0700)
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

1  2 
builtin/clone.c
builtin/pack-objects.c
builtin/rev-list.c
bundle.c
revision.c

diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
diff --cc bundle.c
index 7608701a51ee2a4a18ea4499cb5eaf1823ef5d44,56681c21131619caac82b7a81e527e7974a9ec62..e359370cfcdc7d92077f1e3403d7f6529189de67
+++ 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."));
diff --cc revision.c
Simple merge