From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Sep 2024 01:05:44 +0000 (-0700)
Subject: Merge branch 'ps/reftable-exclude' into jc/cmake-unit-test-updates
X-Git-Tag: v2.47.0-rc0~7^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbc46c0583b62218db94c40403b8a5c12c4b403a;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-exclude' into jc/cmake-unit-test-updates

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

cbc46c0583b62218db94c40403b8a5c12c4b403a
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