From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 May 2024 18:04:26 +0000 (-0700)
Subject: Merge branch 'la/hide-trailer-info'
X-Git-Tag: v2.46.0-rc0~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7593d669284b16db4dc43f9b9bd8cd96ec862377;p=thirdparty%2Fgit.git

Merge branch 'la/hide-trailer-info'

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

7593d669284b16db4dc43f9b9bd8cd96ec862377
diff --cc Makefile
index cf504963c2,5418ddd03b..8f4432ae57
--- a/Makefile
+++ 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
diff --cc trailer.h
index c364405267,82104912d7..6eb53df155
--- a/trailer.h
+++ 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,