From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jan 2026 18:37:33 +0000 (-0800)
Subject: Merge branch 'cc/lop-filter-auto' into seen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94449fef2afe39e79e26153259cd8e5287161dda;p=thirdparty%2Fgit.git

Merge branch 'cc/lop-filter-auto' into seen

"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
---

94449fef2afe39e79e26153259cd8e5287161dda
diff --cc builtin/fetch.c
index afe5d321d1,ddc30a0d30..3d36e1c4d6
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -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;
  		}