sequencer: export and rename subject_length()

This function can be used in other parts of git. Let's move the
function to commit.c and also rename it to make the name of the
function more generic.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index bab8d5ab07c98f4e6fa67bb9469d896bd3d2d205..199c7e274c024af1df1a4b73e10f7a31fe191da5 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -535,6 +535,20 @@ int find_commit_subject(const char *commit_buffer, const char **subject)
        return eol - p;
 }
 
+size_t commit_subject_length(const char *body)
+{
+       const char *p = body;
+       while (*p) {
+               const char *next = skip_blank_lines(p);
+               if (next != p)
+                       break;
+               p = strchrnul(p, '\n');
+               if (*p)
+                       p++;
+       }
+       return p - body;
+}
+
 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
        struct commit_list *new_list = xmalloc(sizeof(struct commit_list));

diff --git a/commit.h b/commit.h
index f4e7b0158e2595ec203ce4bc0fc14cd95192ab72..e65d9b3e7525ae1628c9ddda96874ca9b32e5d90 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -165,6 +165,9 @@ const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
 /* Find beginning and length of commit subject. */
 int find_commit_subject(const char *commit_buffer, const char **subject);
 
+/* Return length of the commit subject from commit log message. */
+size_t commit_subject_length(const char *body);
+
 struct commit_list *commit_list_insert(struct commit *item,
                                        struct commit_list **list);
 int commit_list_contains(struct commit *item,

diff --git a/sequencer.c b/sequencer.c
index abc6d5cdfd45005d1edd1cef9ed6c4a6c854a117..da7d54c7cef6c1658fa4d09503a088c5c2846834 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1724,20 +1724,6 @@ enum todo_item_flags {
        TODO_EDIT_FIXUP_MSG    = (1 << 2),
 };
 
-static size_t subject_length(const char *body)
-{
-       const char *p = body;
-       while (*p) {
-               const char *next = skip_blank_lines(p);
-               if (next != p)
-                       break;
-               p = strchrnul(p, '\n');
-               if (*p)
-                       p++;
-       }
-       return p - body;
-}
-
 static const char first_commit_msg_str[] = N_("This is the 1st commit message:");
 static const char nth_commit_msg_fmt[] = N_("This is the commit message #%d:");
 static const char skip_first_commit_msg_str[] = N_("The 1st commit message will be skipped:");
@@ -1861,7 +1847,7 @@ static int append_squash_message(struct strbuf *buf, const char *body,
        if (starts_with(body, "amend!") ||
            ((command == TODO_SQUASH || seen_squash(opts)) &&
             (starts_with(body, "squash!") || starts_with(body, "fixup!"))))
-               commented_len = subject_length(body);
+               commented_len = commit_subject_length(body);
 
        strbuf_addf(buf, "\n%c ", comment_line_char);
        strbuf_addf(buf, _(nth_commit_msg_fmt),