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:
@ -332,7 +332,7 @@ static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
|
||||
sb->buf[sb->len - ignore_footer] = '\0';
|
||||
}
|
||||
|
||||
trailer_info_get(&info, sb->buf, &opts);
|
||||
trailer_info_get(&opts, sb->buf, &info);
|
||||
|
||||
if (ignore_footer)
|
||||
sb->buf[sb->len - ignore_footer] = saved_char;
|
||||
|
||||
Reference in New Issue
Block a user