summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-14 05:30:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-14 07:49:12 (GMT)
commit8419d2ee9ba8b375186a5c1019df8dfbce610aba (patch)
tree5619415ad270cb79f76656634249d8889096a800
parent767c98a5929b02152c8904a09f1eabbf8d386395 (diff)
downloadgit-8419d2ee9ba8b375186a5c1019df8dfbce610aba.zip
git-8419d2ee9ba8b375186a5c1019df8dfbce610aba.tar.gz
git-8419d2ee9ba8b375186a5c1019df8dfbce610aba.tar.bz2
git-format-patch --in-reply-to: accept <message@id> with angle brackets
This will allow RFC-literate users to say: format-patch --in-reply-to='<message.id@site.name>' without forcing them to strip the surrounding angle brackets like this: format-patch --in-reply-to='message.id@site.name' We accept both forms, and the latter gets necessary < and > around it as before. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-log.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index fa81c25..c6cc3ae 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -437,6 +437,34 @@ static void gen_message_id(char *dest, unsigned int length, char *base)
(int)(email_end - email_start - 1), email_start + 1);
}
+static const char *clean_message_id(const char *msg_id)
+{
+ char ch;
+ const char *a, *z, *m;
+ char *n;
+ size_t len;
+
+ m = msg_id;
+ while ((ch = *m) && (isspace(ch) || (ch == '<')))
+ m++;
+ a = m;
+ z = NULL;
+ while ((ch = *m)) {
+ if (!isspace(ch) && (ch != '>'))
+ z = m;
+ m++;
+ }
+ if (!z)
+ die("insane in-reply-to: %s", msg_id);
+ if (++z == m)
+ return a;
+ len = z - a;
+ n = xmalloc(len + 1);
+ memcpy(n, a, len);
+ n[len] = 0;
+ return n;
+}
+
int cmd_format_patch(int argc, const char **argv, const char *prefix)
{
struct commit *commit;
@@ -625,7 +653,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (numbered)
rev.total = total + start_number - 1;
rev.add_signoff = add_signoff;
- rev.ref_message_id = in_reply_to;
+ if (in_reply_to)
+ rev.ref_message_id = clean_message_id(in_reply_to);
while (0 <= --nr) {
int shown;
commit = list[nr];