diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:29 +0300 |
| commit | 59a29e1274948bf9a3ef44c65903d09194464e1c (patch) | |
| tree | 99be8596157d36d62baed5a38e195e99c91c1dad /sequencer.c | |
| parent | 43ec8791692f70768fa8eb23056db6a4e0ba3c6a (diff) | |
| parent | de7c27a1869953158436e60542ea556d78c3f4c2 (diff) | |
Merge branch 'la/trailer-cleanups'
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++) |