]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/reftable-exclude'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Sep 2024 17:37:11 +0000 (10:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Sep 2024 17:37:11 +0000 (10:37 -0700)
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

1  2 
Makefile
builtin/receive-pack.c
refs.c
refs.h
refs/reftable-backend.c

diff --cc Makefile
index 9cf2be070fa26b1339523ea5b345ddc2a3c64f2b,4039e355b093efbf09ef8d3646f7bf8befd8aa69..7344a7f7257af6df6620929567a99bf007fd703e
+++ 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
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge
index 043e19439f6c49b99527079a81a81f5a2ad1175e,3e63833ce4159b8eaf41351b56d14c33313c16c4..f5f957e6de428ab613efdbec297cc5c87c6b85d9
  #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"