summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-17 02:27:03 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-17 02:27:03 (GMT)
commit409d1d2053657f73a3222651111740606122aa80 (patch)
treeb390bab89858bc4894ddee75d2b3128eed2ce8a6
parent076a10c7282a08f783a28c1b64d0e114a3fe3d39 (diff)
parentc35f4c371ac12f4d29b08e46c519ddc0a6494f6e (diff)
downloadgit-409d1d2053657f73a3222651111740606122aa80.zip
git-409d1d2053657f73a3222651111740606122aa80.tar.gz
git-409d1d2053657f73a3222651111740606122aa80.tar.bz2
Merge branch 'jc/format-patch'
* jc/format-patch: Add a newline before appending "Signed-off-by: " line
-rw-r--r--log-tree.c44
1 files changed, 43 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 05ede0c..031af88 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -19,7 +19,7 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
char *cp = buf;
/* Do we have enough space to add it? */
- if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
+ if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 3)
return at;
/* First see if we already have the sign-off by the signer */
@@ -34,6 +34,48 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
return at; /* we already have him */
}
+ /* Does the last line already end with "^[-A-Za-z]+: [^@]+@"?
+ * If not, add a blank line to separate the message from
+ * the run of Signed-off-by: and Acked-by: lines.
+ */
+ {
+ char ch;
+ int seen_colon, seen_at, seen_name, seen_head, not_signoff;
+ seen_colon = 0;
+ seen_at = 0;
+ seen_name = 0;
+ seen_head = 0;
+ not_signoff = 0;
+ cp = buf + at;
+ while (buf <= --cp && (ch = *cp) == '\n')
+ ;
+ while (!not_signoff && buf <= cp && (ch = *cp--) != '\n') {
+ if (!seen_at) {
+ if (ch == '@')
+ seen_at = 1;
+ continue;
+ }
+ if (!seen_colon) {
+ if (ch == '@')
+ not_signoff = 1;
+ else if (ch == ':')
+ seen_colon = 1;
+ else
+ seen_name = 1;
+ continue;
+ }
+ if (('A' <= ch && ch <= 'Z') ||
+ ('a' <= ch && ch <= 'z') ||
+ ch == '-') {
+ seen_head = 1;
+ continue;
+ }
+ not_signoff = 1;
+ }
+ if (not_signoff || !seen_head || !seen_name)
+ buf[at++] = '\n';
+ }
+
strcpy(buf + at, signed_off_by);
at += strlen(signed_off_by);
strcpy(buf + at, signoff);