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>
Daniel Barkalow committed
Feb 18, 2008 at 22:56 UTC
e1a37346210da8b165037984e02f750a6a135480
2 files changed
+15
-16
builtin-log.c
+14
-15
@@ -575,16 +575,19 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha
575
o2->flags = flags2;
576
}
577
578
-static void gen_message_id(char *dest, unsigned int length, char *base)
578
+static void gen_message_id(struct rev_info *info, char *base)
579
{
580
const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
581
const char *email_start = strrchr(committer, '<');
582
const char *email_end = strrchr(committer, '>');
583
- if(!email_start || !email_end || email_start > email_end - 1)
583
+ struct strbuf buf;
584
+ if (!email_start || !email_end || email_start > email_end - 1)
585
die("Could not extract email from committer identity.");
585
- snprintf(dest, length, "%s.%lu.git.%.*s", base,
586
- (unsigned long) time(NULL),
587
- (int)(email_end - email_start - 1), email_start + 1);
586
+ strbuf_init(&buf, 0);
587
+ strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
588
+ (unsigned long) time(NULL),
589
+ (int)(email_end - email_start - 1), email_start + 1);
590
+ info->message_id = strbuf_detach(&buf, NULL);
591
}
592
593
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)
628
const char *in_reply_to = NULL;
629
struct patch_ids ids;
630
char *add_signoff = NULL;
628
- char message_id[1024];
629
- char ref_message_id[1024];
631
632
git_config(git_format_config);
633
init_revisions(&rev, prefix);
@@ -809,15 +810,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
810
rev.nr = total - nr + (start_number - 1);
811
/* Make the second and subsequent mails replies to the first */
812
if (thread) {
812
- if (nr == (total - 2)) {
813
- strncpy(ref_message_id, message_id,
814
- sizeof(ref_message_id));
815
- ref_message_id[sizeof(ref_message_id)-1]='\0';
816
- rev.ref_message_id = ref_message_id;
813
+ if (rev.message_id) {
814
+ if (rev.ref_message_id)
815
+ free(rev.message_id);
816
+ else
817
+ rev.ref_message_id = rev.message_id;
818
}
818
- gen_message_id(message_id, sizeof(message_id),
819
- sha1_to_hex(commit->object.sha1));
820
- rev.message_id = message_id;
819
+ gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
820
}
821
if (!use_stdout)
822
if (reopen_stdout(commit, rev.nr, keep_subject,
revision.h
+1
-1
@@ -74,7 +74,7 @@ struct rev_info {
74
struct log_info *loginfo;
75
int nr, total;
76
const char *mime_boundary;
77
- const char *message_id;
77
+ char *message_id;
78
const char *ref_message_id;
79
const char *add_signoff;
80
const char *extra_headers;