Re: [PATCH 04/11] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2012-11-28 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: -static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) +static int is_rfc2822_line(const char *buf, int len) +{ + int i; + + for (i = 0; i len; i++) { + int ch = buf[i]; + if (ch == ':') +

Re: [PATCH 04/11] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2012-11-28 Thread Brandon Casey
On 11/28/2012 4:02 PM, Junio C Hamano wrote: Brandon Casey draf...@gmail.com writes: -static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) +static int is_rfc2822_line(const char *buf, int len) +{ + int i; + + for (i = 0; i len; i++) { + int ch =

[PATCH 04/11] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2012-11-25 Thread Brandon Casey
When 'cherry-pick -s' is used to append a signed-off-by line to a cherry picked commit, it does not currently detect the (cherry picked from... that may have been appended by a previous 'cherry-pick -x' as part of the s-o-b footer and it will insert a blank line before appending a new s-o-b.