commit: ignore_non_trailer computes number of bytes to ignore
ignore_non_trailer() returns the _number of bytes_ that should be ignored from the end of the log message. It does not by itself "ignore" anything. Rename this function to remove the leading "ignore" verb, to sound more like a quantity than an action. Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Arver committed
Oct 20, 2023 at 19:01 UTC
7cb26a1722a7f7d9f1b01f2dcde8fe81d3a96bc1
5 files changed
+6
-6
builtin/commit.c
+1
-1
@@ -900,7 +900,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
900
strbuf_stripspace(&sb, '\0');
901
902
if (signoff)
903
- append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0);
903
+ append_signoff(&sb, ignored_log_message_bytes(sb.buf, sb.len), 0);
904
905
if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
906
die_errno(_("could not write commit template"));
builtin/merge.c
+1
-1
@@ -870,7 +870,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
870
_(no_scissors_editor_comment), comment_line_char);
871
}
872
if (signoff)
873
- append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
873
+ append_signoff(&msg, ignored_log_message_bytes(msg.buf, msg.len), 0);
874
write_merge_heads(remoteheads);
875
write_file_buf(git_path_merge_msg(the_repository), msg.buf, msg.len);
876
if (run_commit_hook(0 < option_edit, get_index_file(), NULL,
commit.c
+1
-1
@@ -1769,7 +1769,7 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
1769
* Returns the number of bytes from the tail to ignore, to be fed as
1770
* the second parameter to append_signoff().
1771
*/
1772
-size_t ignore_non_trailer(const char *buf, size_t len)
1772
+size_t ignored_log_message_bytes(const char *buf, size_t len)
1773
{
1774
size_t boc = 0;
1775
size_t bol = 0;
commit.h
+2
-2
@@ -294,8 +294,8 @@ const char *find_header_mem(const char *msg, size_t len,
294
const char *find_commit_header(const char *msg, const char *key,
295
size_t *out_len);
296
297
-/* Find the end of the log message, the right place for a new trailer. */
298
-size_t ignore_non_trailer(const char *buf, size_t len);
297
+/* Find the number of bytes to ignore from the end of a log message. */
298
+size_t ignored_log_message_bytes(const char *buf, size_t len);
299
300
typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
301
void *cb_data);
trailer.c
+1
-1
@@ -928,7 +928,7 @@ continue_outer_loop:
928
/* Return the position of the end of the trailers. */
929
static size_t find_trailer_end(const char *buf, size_t len)
930
{
931
- return len - ignore_non_trailer(buf, len);
931
+ return len - ignored_log_message_bytes(buf, len);
932
}
933
934
static int ends_with_blank_line(const char *buf, size_t len)