Improve message-id generation flow control for format-patch

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-log.c b/builtin-log.c
index 99d69f079132ed67e2d5bc83bf95e6e60ba22f6f..4f08ca40aa05ec519ea34f8febfa294f14293946 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -575,16 +575,19 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha
        o2->flags = flags2;
 }
 
        o2->flags = flags2;
 }
 

-static void gen_message_id(char *dest, unsigned int length, char *base)
+static void gen_message_id(struct rev_info *info, char *base)

 {
        const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
        const char *email_start = strrchr(committer, '<');
        const char *email_end = strrchr(committer, '>');
 {
        const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
        const char *email_start = strrchr(committer, '<');
        const char *email_end = strrchr(committer, '>');

-       if(!email_start || !email_end || email_start > email_end - 1)
+       struct strbuf buf;
+       if (!email_start || !email_end || email_start > email_end - 1)

                die("Could not extract email from committer identity.");
                die("Could not extract email from committer identity.");

-       snprintf(dest, length, "%s.%lu.git.%.*s", base,
-                (unsigned long) time(NULL),
-                (int)(email_end - email_start - 1), email_start + 1);
+       strbuf_init(&buf, 0);
+       strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
+                   (unsigned long) time(NULL),
+                   (int)(email_end - email_start - 1), email_start + 1);
+       info->message_id = strbuf_detach(&buf, NULL);

 }
 
 static const char *clean_message_id(const char *msg_id)
 }
 
 static const char *clean_message_id(const char *msg_id)


@@ -625,8 +628,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        const char *in_reply_to = NULL;
        struct patch_ids ids;
        char *add_signoff = NULL;
        const char *in_reply_to = NULL;
        struct patch_ids ids;
        char *add_signoff = NULL;

-       char message_id[1024];
-       char ref_message_id[1024];

 
        git_config(git_format_config);
        init_revisions(&rev, prefix);
 
        git_config(git_format_config);
        init_revisions(&rev, prefix);


@@ -809,15 +810,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                rev.nr = total - nr + (start_number - 1);
                /* Make the second and subsequent mails replies to the first */
                if (thread) {
                rev.nr = total - nr + (start_number - 1);
                /* Make the second and subsequent mails replies to the first */
                if (thread) {

-                       if (nr == (total - 2)) {
-                               strncpy(ref_message_id, message_id,
-                                       sizeof(ref_message_id));
-                               ref_message_id[sizeof(ref_message_id)-1]='\0';
-                               rev.ref_message_id = ref_message_id;
+                       if (rev.message_id) {
+                               if (rev.ref_message_id)
+                                       free(rev.message_id);
+                               else
+                                       rev.ref_message_id = rev.message_id;

                        }
                        }

-                       gen_message_id(message_id, sizeof(message_id),
-                                      sha1_to_hex(commit->object.sha1));
-                       rev.message_id = message_id;
+                       gen_message_id(&rev, sha1_to_hex(commit->object.sha1));

                }
                if (!use_stdout)
                        if (reopen_stdout(commit, rev.nr, keep_subject,
                }
                if (!use_stdout)
                        if (reopen_stdout(commit, rev.nr, keep_subject,

diff --git a/revision.h b/revision.h
index 8572315954d1fde8c36c426d66c665534c22d1f2..e3559d019d5b33ec1bcf5b2c2d820c252aecfc7c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -74,7 +74,7 @@ struct rev_info {
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;

-       const char      *message_id;
+       char            *message_id;

        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;