diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-14 21:05:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 21:05:24 (GMT) |
| commit | 4fecb948879e779c7180e398f8fe9940a4f939bf (patch) | |
| tree | fb080bdf1a345c66b6b0ccda5a0dd27c4a1e9faa /ref-filter.c | |
| parent | 26ab20ccb26d5ead9f915e50b5511456a955f074 (diff) | |
| parent | 35ca4411a04a052e4365aa8a321491706156f7a0 (diff) | |
| download | git-4fecb948879e779c7180e398f8fe9940a4f939bf.zip git-4fecb948879e779c7180e398f8fe9940a4f939bf.tar.gz git-4fecb948879e779c7180e398f8fe9940a4f939bf.tar.bz2 | |
Merge branch 'la/trailer-api'
Trailer API updates.
Acked-by: Christian Couder <christian.couder@gmail.com>
cf. <CAP8UFD1Zd+9q0z1JmfOf60S2vn5-sD3SafDvAJUzRFwHJKcb8A@mail.gmail.com>
* la/trailer-api:
format_trailers_from_commit(): indirectly call trailer_info_get()
format_trailer_info(): move "fast path" to caller
format_trailers(): use strbuf instead of FILE
trailer_info_get(): reorder parameters
trailer: move interpret_trailers() to interpret-trailers.c
trailer: reorder format_trailers_from_commit() parameters
trailer: rename functions to use 'trailer'
shortlog: add test for de-duplicating folded trailers
trailer: free trailer_info _after_ all related usage
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ref-filter.c b/ref-filter.c index 0ec29f7..03542d0 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1991,7 +1991,7 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct exp struct strbuf s = STRBUF_INIT; /* Format the trailer info according to the trailer_opts given */ - format_trailers_from_commit(&s, subpos, &atom->u.contents.trailer_opts); + format_trailers_from_commit(&atom->u.contents.trailer_opts, subpos, &s); v->s = strbuf_detach(&s, NULL); } else if (atom->u.contents.option == C_BARE) |