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 /builtin/merge.c | |
| parent | edf4c0d42b75fb1a94a21db75d020472cc0a6cf2 (diff) | |
| parent | de7c27a1869953158436e60542ea556d78c3f4c2 (diff) | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index d748d46e13..f837483312 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -869,7 +869,7 @@ static void prepare_to_commit(struct commit_list *remoteheads) _(no_scissors_editor_comment), comment_line_char); } if (signoff) - append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0); + append_signoff(&msg, ignored_log_message_bytes(msg.buf, msg.len), 0); write_merge_heads(remoteheads); write_file_buf(git_path_merge_msg(the_repository), msg.buf, msg.len); if (run_commit_hook(0 < option_edit, get_index_file(), NULL, |