Merge branch 'lc/rebase-trailer' into jch

"git rebase" learns "--trailer" command to drive the
interpret-trailers machinery.

Comments?

* lc/rebase-trailer:
  rebase: support --trailer
  commit, tag: parse --trailer with OPT_STRVEC
  trailer: append trailers without fork/exec
  trailer: libify a couple of functions
  interpret-trailers: refactor create_in_place_tempfile()
  interpret-trailers: factor trailer rewriting
This commit is contained in:
Junio C Hamano
2026-03-11 14:57:57 -07:00
11 changed files with 459 additions and 87 deletions

View File

@@ -57,6 +57,8 @@ struct replay_opts {
int ignore_date;
int commit_use_reference;
struct strvec trailer_args;
int mainline;
char *gpg_sign;
@@ -84,6 +86,7 @@ struct replay_opts {
#define REPLAY_OPTS_INIT { \
.edit = -1, \
.action = -1, \
.trailer_args = STRVEC_INIT, \
.xopts = STRVEC_INIT, \
.ctx = replay_ctx_new(), \
}