diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:09 -0800 |
| commit | 541d0d75e781fad5761414d7a5500b8840f3e5bb (patch) | |
| tree | efd22786b282e2381297e801cb42be49226a6cf9 /sequencer.c | |
| parent | edf4c0d42b75fb1a94a21db75d020472cc0a6cf2 (diff) | |
| parent | de7c27a1869953158436e60542ea556d78c3f4c2 (diff) | |
| download | git-541d0d75e781fad5761414d7a5500b8840f3e5bb.tar.gz | |
Merge branch 'la/trailer-cleanups' into maint-2.43
Code clean-up.
* la/trailer-cleanups:
trailer: use offsets for trailer_start/trailer_end
trailer: find the end of the log message
commit: ignore_non_trailer computes number of bytes to ignore
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 74c3b1243e..455fc0a39f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -340,7 +340,7 @@ static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob, if (ignore_footer) sb->buf[sb->len - ignore_footer] = saved_char; - if (info.trailer_start == info.trailer_end) + if (info.trailer_block_start == info.trailer_block_end) return 0; for (i = 0; i < info.trailer_nr; i++) |