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

2013-02-12 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.

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

2013-02-12 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: 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

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

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:13 AM, Junio C Hamano wrote: Brandon Casey draf...@gmail.com writes: 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

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

2013-02-12 Thread Junio C Hamano
Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the prefix? check matter? If it is not, prefixcmp() would not match anyway, no? Probably

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

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: On 2/12/2013 11:13 AM, Junio C Hamano wrote: Brandon Casey draf...@gmail.com writes: +static int is_cherry_picked_from_line(const char *buf, int len) +{ + /* +* We only care that it looks roughly like (cherry picked from ...) +*/ + return len

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

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:36 AM, Junio C Hamano wrote: Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the prefix? check matter? If it is not,

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

2013-02-12 Thread Junio C Hamano
Brandon Casey bca...@nvidia.com writes: On 2/12/2013 11:36 AM, Junio C Hamano wrote: Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the