From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Sep 2024 17:37:11 +0000 (-0700)
Subject: Merge branch 'ps/reftable-exclude'
X-Git-Tag: v2.47.0-rc0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52f57e94bd1cc32eef1b02b941250720017f0b34;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-exclude'

The reftable backend learned to more efficiently handle exclude
patterns while enumerating the refs.

* ps/reftable-exclude:
  refs/reftable: wire up support for exclude patterns
  reftable/reader: make table iterator reseekable
  t/unit-tests: introduce reftable library
  Makefile: stop listing test library objects twice
  builtin/receive-pack: fix exclude patterns when announcing refs
  refs: properly apply exclude patterns to namespaced refs
---

52f57e94bd1cc32eef1b02b941250720017f0b34
diff --cc Makefile
index 9cf2be070f,4039e355b0..7344a7f725
--- a/Makefile
+++ b/Makefile
@@@ -2724,7 -2716,7 +2725,8 @@@ OBJECTS += $(XDIFF_OBJS
  OBJECTS += $(FUZZ_OBJS)
  OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
  OBJECTS += $(UNIT_TEST_OBJS)
 +OBJECTS += $(CLAR_TEST_OBJS)
+ OBJECTS += $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS))
  
  ifndef NO_CURL
  	OBJECTS += http.o http-walker.o remote-curl.o
diff --cc refs/reftable-backend.c
index 043e19439f,3e63833ce4..f5f957e6de
--- a/refs/reftable-backend.c
+++ b/refs/reftable-backend.c
@@@ -19,9 -19,9 +19,10 @@@
  #include "../reftable/reftable-record.h"
  #include "../reftable/reftable-error.h"
  #include "../reftable/reftable-iterator.h"
 +#include "../repo-settings.h"
  #include "../setup.h"
  #include "../strmap.h"
+ #include "../trace2.h"
  #include "parse.h"
  #include "refs-internal.h"