Re: Notes in format-patch

2012-11-14 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 13.11.2012 19:09: >> Junio C Hamano writes: >> >>> ... and it is broken X-<. >>> >>> The blank line should be added before the diffstat, not after the >>> notes message (t3307 shows a case where we give notes without >>> diffstat, an

Re: Notes in format-patch

2012-11-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 13.11.2012 19:09: > Junio C Hamano writes: > >> ... and it is broken X-<. >> >> The blank line should be added before the diffstat, not after the >> notes message (t3307 shows a case where we give notes without >> diffstat, and we shouldn't be adding an extra bl

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano writes: > ... and it is broken X-<. > > The blank line should be added before the diffstat, not after the > notes message (t3307 shows a case where we give notes without > diffstat, and we shouldn't be adding an extra blank line in that > case. Second try. -- >8 -- Subject: forma

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano writes: > As the topic seems to be already in Peff's next, here is a trivial > fix for this in incremental form. > > -- >8 -- > Subject: format-patch: add a blank line between notes and diffstat > > The last line of the note text comes immediately before the diffstat > block, makin

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano writes: > Michael J Gruber writes: > >> Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: >>> 'git replace' parses the revision arguments when it creates replacements >>> (so that a sha1 can be abbreviated, e.g.) but not when deleting >>> replacements. >>> >>> Make it parse

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Michael J Gruber writes: > Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: >> 'git replace' parses the revision arguments when it creates replacements >> (so that a sha1 can be abbreviated, e.g.) but not when deleting >> replacements. >> >> Make it parse the argument to 'replace -d' in th

Re: Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d)

2012-11-13 Thread Jeff King
On Tue, Nov 13, 2012 at 11:30:19AM +0100, Michael J Gruber wrote: > Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: > > 'git replace' parses the revision arguments when it creates replacements > > (so that a sha1 can be abbreviated, e.g.) but not when deleting > > replacements. > > > > Mak

Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d)

2012-11-13 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: > 'git replace' parses the revision arguments when it creates replacements > (so that a sha1 can be abbreviated, e.g.) but not when deleting > replacements. > > Make it parse the argument to 'replace -d' in the same way. > > Signed-off-by: Mi