blame: use find_commit_subject() instead of custom code

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/blame.c b/builtin/blame.c
index 8506286dd271d4e92369d81ec2cce9240a559d64..8dca385f1fd8f873c0b223b533be1b42dbffb5fd 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1371,7 +1371,8 @@ static void get_commit_info(struct commit *commit,
                            int detailed)
 {
        int len;
                            int detailed)
 {
        int len;

-       char *tmp, *endp, *reencoded, *message;
+       const char *subject;
+       char *reencoded, *message;

        static char author_name[1024];
        static char author_mail[1024];
        static char committer_name[1024];
        static char author_name[1024];
        static char author_mail[1024];
        static char committer_name[1024];


@@ -1413,22 +1414,13 @@ static void get_commit_info(struct commit *commit,
                    &ret->committer_time, &ret->committer_tz);
 
        ret->summary = summary_buf;
                    &ret->committer_time, &ret->committer_tz);
 
        ret->summary = summary_buf;

-       tmp = strstr(message, "\n\n");
-       if (!tmp) {
-       error_out:
+       len = find_commit_subject(message, &subject);
+       if (len && len < sizeof(summary_buf)) {
+               memcpy(summary_buf, subject, len);
+               summary_buf[len] = 0;
+       } else {

                sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));
                sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));

-               free(reencoded);
-               return;

        }
        }

-       tmp += 2;
-       endp = strchr(tmp, '\n');
-       if (!endp)
-               endp = tmp + strlen(tmp);
-       len = endp - tmp;
-       if (len >= sizeof(summary_buf) || len == 0)
-               goto error_out;
-       memcpy(summary_buf, tmp, len);
-       summary_buf[len] = 0;

        free(reencoded);
 }
 
        free(reencoded);
 }