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 /builtin/merge.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 '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, |