From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Dec 2025 03:19:54 +0000 (+0900)
Subject: Merge branch 'lc/rebase-trailer' into seen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bc716dfafa5275fb85630d1b8aed7202161e063;p=thirdparty%2Fgit.git

Merge branch 'lc/rebase-trailer' into seen

Refactor code paths to run "interpret-trailers" from "git
commit/tag" and use it in "git rebase".

* lc/rebase-trailer:
  rebase: support --trailer
  trailer: append trailers in-process and drop the fork to `interpret-trailers`
  trailer: move process_trailers to trailer.h
  interpret-trailers: factor out buffer-based processing to process_trailers()
---

9bc716dfafa5275fb85630d1b8aed7202161e063
diff --cc t/meson.build
index f1f5b6b9ee,56bc3291ce..3530006848
--- a/t/meson.build
+++ b/t/meson.build
@@@ -389,9 -385,7 +389,10 @@@ integration_tests = 
    't3436-rebase-more-options.sh',
    't3437-rebase-fixup-options.sh',
    't3438-rebase-broken-files.sh',
+   't3440-rebase-trailer.sh',
 +  't3450-history.sh',
 +  't3451-history-reword.sh',
 +  't3452-history-split.sh',
    't3500-cherry.sh',
    't3501-revert-cherry-pick.sh',
    't3502-cherry-pick-merge.sh',