]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cc/lop-filter-auto' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jan 2026 18:37:33 +0000 (10:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jan 2026 18:37:33 +0000 (10:37 -0800)
"auto filter" logic for large-object promisor remote.

Comments?

* cc/lop-filter-auto:
  fetch-pack: wire up and enable auto filter logic
  promisor-remote: keep advertised filter in memory
  list-objects-filter-options: implement auto filter resolution
  list-objects-filter-options: support 'auto' mode for --filter
  doc: fetch: document `--filter=<filter-spec>` option
  fetch: make filter_options local to cmd_fetch()
  clone: make filter_options local to cmd_clone()
  promisor-remote: allow a client to store fields
  promisor-remote: refactor initialising field lists

1  2 
Makefile
builtin/clone.c
builtin/fetch.c
t/meson.build
transport.c

diff --cc Makefile
Simple merge
diff --cc builtin/clone.c
Simple merge
diff --cc builtin/fetch.c
index afe5d321d183883c56a44e7b395369af5b7c1413,ddc30a0d309097d2f71423df4c9b94d9f724532d..3d36e1c4d64dd03fea16781ec205edc780ca755c
@@@ -1590,7 -1494,7 +1590,8 @@@ static int backfill_tags(struct display
                         struct ref *ref_map,
                         struct fetch_head *fetch_head,
                         const struct fetch_config *config,
-                        struct strmap *delayed_ref_display)
++                       struct strmap *delayed_ref_display,
+                        struct list_objects_filter_options *filter_options)
  {
        int retcode, cannot_reuse;
  
@@@ -1984,8 -1874,8 +1986,9 @@@ static int do_fetch(struct transport *t
                         * when `--atomic` is passed: in that case we'll abort
                         * the transaction and don't commit anything.
                         */
--                      if (backfill_tags(&display_state, transport, transaction, tags_ref_map,
-                                         &fetch_head, config, &delayed_ref_display))
 -                                        &fetch_head, config, filter_options))
++                      if (backfill_tags(&display_state, transport, transaction,
++                                        tags_ref_map, &fetch_head, config,
++                                        &delayed_ref_display, filter_options))
                                retcode = 1;
                }
  
diff --cc t/meson.build
Simple merge
diff --cc transport.c
Simple merge