Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Brandon Casey
On Thu, Feb 21, 2013 at 12:26 PM, Brandon Casey draf...@gmail.com wrote: But, this does not fix the same problem for 'cherry-pick --edit -s' when used to cherry-pick a commit without a sob. Correction: when used to cherry-pick a commit with an empty commit message. -- To unsubscribe from this

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Brandon Casey
On Thu, Feb 21, 2013 at 10:51 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-21 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: Yes. The fix described by John Keeping restores the above behavior for 'commit -s'. Or the fix I described which inserts two preceding newlines so it looks like this:

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-17 Thread John Keeping
On Fri, Feb 15, 2013 at 10:58:38AM -0800, Brandon Casey wrote: On Thu, Feb 14, 2013 at 9:58 AM, John Keeping j...@keeping.me.uk wrote: As Jonathan Nieder wondered before [1], this changes the behaviour when the commit message is empty. Before this commit, there is an empty line followed by

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-15 Thread Brandon Casey
On Thu, Feb 14, 2013 at 9:58 AM, John Keeping j...@keeping.me.uk wrote: On Tue, Feb 12, 2013 at 02:33:42AM -0800, Brandon Casey wrote: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-14 Thread John Keeping
On Tue, Feb 12, 2013 at 02:33:42AM -0800, Brandon Casey wrote: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to

[PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-12 Thread Brandon Casey
Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new footer is separated from the message body by a