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 gits...@pobox.com 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

Re: Notes in format-patch

2012-11-14 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 13.11.2012 19:09: Junio C Hamano gits...@pobox.com 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

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

2012-11-13 Thread Michael J Gruber
- Junio, is that the intented outcome of format-patch --notes? I would rather put the newline between the note and the diffstat (and omit the one after the ---) but may have goofed up a rebase: ... Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: v3 safeguards the hex buffer

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

2012-11-13 Thread Jeff King
deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c By the way - Junio, is that the intented outcome of format-patch --notes? I would rather put the newline between the note and the diffstat (and omit the one after the ---) but may have goofed up a rebase: I do not know

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
a/builtin/replace.c b/builtin/replace.c By the way - Junio, is that the intented outcome of format-patch --notes? I would rather put the newline between the note and the diffstat... I do not mind (actually I personally would prefer to see) a blank line between the three-dash and Notes:, but I

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
insertions(+), 6 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c By the way - Junio, is that the intented outcome of format-patch --notes? I would rather put the newline between the note and the diffstat... I do not mind (actually I personally would prefer to see) a blank line

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com 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

Re: Notes in format-patch

2012-11-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com 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 --