]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'la/hide-trailer-info'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 18:04:26 +0000 (11:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 18:04:27 +0000 (11:04 -0700)
The trailer API has been reshuffled a bit.

* la/hide-trailer-info:
  trailer unit tests: inspect iterator contents
  trailer: document parse_trailers() usage
  trailer: retire trailer_info_get() from API
  trailer: make trailer_info struct private
  trailer: make parse_trailers() return trailer_info pointer
  interpret-trailers: access trailer_info with new helpers
  sequencer: use the trailer iterator
  trailer: teach iterator about non-trailer lines
  trailer: add unit tests for trailer iterator
  Makefile: sort UNIT_TEST_PROGRAMS

1  2 
Makefile
builtin/interpret-trailers.c
sequencer.c
trailer.c
trailer.h

diff --cc Makefile
index cf504963c21716c49fae8b62124ed7d59f69d2b3,5418ddd03be774e301e370c416447edd9f5e534c..8f4432ae57cdd0414720ea51779be89affe28cee
+++ b/Makefile
@@@ -1334,10 -1342,12 +1334,11 @@@ THIRD_PARTY_SOURCES += compat/regex/
  THIRD_PARTY_SOURCES += sha1collisiondetection/%
  THIRD_PARTY_SOURCES += sha1dc/%
  
- UNIT_TEST_PROGRAMS += t-mem-pool
- UNIT_TEST_PROGRAMS += t-strbuf
 -UNIT_TEST_PROGRAMS += t-basic
  UNIT_TEST_PROGRAMS += t-ctype
+ UNIT_TEST_PROGRAMS += t-mem-pool
  UNIT_TEST_PROGRAMS += t-prio-queue
+ UNIT_TEST_PROGRAMS += t-strbuf
+ UNIT_TEST_PROGRAMS += t-trailer
  UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS))
  UNIT_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS))
  UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc trailer.c
Simple merge
diff --cc trailer.h
index c364405267a7091767af87190e2335df67c60b37,82104912d70b3c72c133e30fc843388d91f4378b..6eb53df155eb45ec2082d34084e4c470596b1e6c
+++ b/trailer.h
@@@ -4,7 -4,7 +4,8 @@@
  #include "list.h"
  #include "strbuf.h"
  
+ struct trailer_info;
 +struct strvec;
  
  enum trailer_where {
        WHERE_DEFAULT,