mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user