development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/format-patch'

Browse source 
* jc/format-patch:
  Add a newline before appending "Signed-off-by: " line
This commit is contained in:
Junio C Hamano 2006-08-16 19:27:03 -07:00
parent 076a10c728 c35f4c371a
commit 409d1d2053
1 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
log-tree.c
View file

@ -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);