diff options
| author | Jeff King <peff@peff.net> | 2018-08-23 02:46:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-23 19:08:51 +0200 |
| commit | 00a21f5cbda35eb5d355b453849b625eeca7eac4 (patch) | |
| tree | 2307ca3358c0fecd27f88d56f64d050566717273 /sequencer.c | |
| parent | trailer: use size_t for iterating trailer list (diff) | |
| download | git-00a21f5cbda35eb5d355b453849b625eeca7eac4.tar.xz git-00a21f5cbda35eb5d355b453849b625eeca7eac4.zip | |
trailer: pass process_trailer_opts to trailer_info_get()
Most of the trailer code has an "opts" struct which is
filled in by the caller. We don't pass it down to
trailer_info_get(), which does the initial parsing, because
there hasn't yet been a need to do so.
Let's start passing it down in preparation for adding new
options. Note that there's a single caller which doesn't
otherwise have such an options struct. Since it's just one
caller (that we'd have to modify anyway), let's not bother
with any special treatment like accepting a NULL options
struct, and just have it allocate one with the defaults.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index b0613c06bb..849208eb40 100644 --- a/sequencer.c +++ b/sequencer.c @@ -224,11 +224,12 @@ static const char *get_todo_path(const struct replay_opts *opts) static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob, int ignore_footer) { + struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT; struct trailer_info info; size_t i; int found_sob = 0, found_sob_last = 0; - trailer_info_get(&info, sb->buf); + trailer_info_get(&info, sb->buf, &opts); if (info.trailer_start == info.trailer_end) return 0; |