# [PATCH 3/4] Retain extra blank lines between the summary and the body 4 messages from 2008-02-06 to 2008-02-07. Participants: Daniel Barkalow, Junio C Hamano. Thread: https://gitlist.dev/t/11919 ## Daniel Barkalow, 2008-02-06 16:43 Subject: [PATCH 3/4] Retain extra blank lines between the summary and the body Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802061141320.13593%40iabervon.org ``` This is so that it's possible to have a message that will generate an email with the first line blank. If the email you're generating is actually a template, you may have a single line filling in for a ~3-line paragraph, meaning that the space starts with a blank line, which was impossible before as output from the message-splitting code. Signed-off-by: Daniel Barkalow --- pretty.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/pretty.c b/pretty.c index f82380b..98efac2 100644 --- a/pretty.c +++ b/pretty.c @@ -713,7 +713,6 @@ void pp_remainder(enum cmit_fmt fmt, struct strbuf *sb, int indent) { - int first = 1; for (;;) { const char *line = *msg_p; int linelen = get_one_line(line); @@ -723,12 +722,9 @@ void pp_remainder(enum cmit_fmt fmt, break; if (is_empty_line(line, &linelen)) { - if (first) - continue; if (fmt == CMIT_FMT_SHORT) break; } - first = 0; strbuf_grow(sb, linelen + indent + 20); if (indent) { -- 1.5.4.27.gf6864 ``` ## Junio C Hamano, 2008-02-06 20:30 Subject: Re: [PATCH 3/4] Retain extra blank lines between the summary and the body Message-ID: <7v4pclx1xu.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4pclx1xu.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Daniel Barkalow writes: > This is so that it's possible to have a message that will generate an > email with the first line blank. If the email you're generating is > actually a template, you may have a single line filling in for a > ~3-line paragraph, meaning that the space starts with a blank line, > which was impossible before as output from the message-splitting code. > > Signed-off-by: Daniel Barkalow > --- > pretty.c | 4 ---- > 1 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/pretty.c b/pretty.c > index f82380b..98efac2 100644 > --- a/pretty.c > +++ b/pretty.c > @@ -713,7 +713,6 @@ void pp_remainder(enum cmit_fmt fmt, > struct strbuf *sb, > int indent) > { > - int first = 1; > for (;;) { > const char *line = *msg_p; > int linelen = get_one_line(line); > @@ -723,12 +722,9 @@ void pp_remainder(enum cmit_fmt fmt, > break; > > if (is_empty_line(line, &linelen)) { > - if (first) > - continue; > if (fmt == CMIT_FMT_SHORT) > break; > } > - first = 0; > > strbuf_grow(sb, linelen + indent + 20); > if (indent) { I have to wonder if this regresses the normal codepath to cleanse commit messages that have extra blanks at the beginning. ``` ## Daniel Barkalow, 2008-02-06 22:17 Subject: Re: [PATCH 3/4] Retain extra blank lines between the summary and the body Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802061711231.13593%40iabervon.org In-Reply-To: <7v4pclx1xu.fsf@gitster.siamese.dyndns.org> ``` On Wed, 6 Feb 2008, Junio C Hamano wrote: > Daniel Barkalow writes: > > > This is so that it's possible to have a message that will generate an > > email with the first line blank. If the email you're generating is > > actually a template, you may have a single line filling in for a > > ~3-line paragraph, meaning that the space starts with a blank line, > > which was impossible before as output from the message-splitting code. > > > > Signed-off-by: Daniel Barkalow > > --- > > pretty.c | 4 ---- > > 1 files changed, 0 insertions(+), 4 deletions(-) > > > > diff --git a/pretty.c b/pretty.c > > index f82380b..98efac2 100644 > > --- a/pretty.c > > +++ b/pretty.c > > @@ -713,7 +713,6 @@ void pp_remainder(enum cmit_fmt fmt, > > struct strbuf *sb, > > int indent) > > { > > - int first = 1; > > for (;;) { > > const char *line = *msg_p; > > int linelen = get_one_line(line); > > @@ -723,12 +722,9 @@ void pp_remainder(enum cmit_fmt fmt, > > break; > > > > if (is_empty_line(line, &linelen)) { > > - if (first) > > - continue; > > if (fmt == CMIT_FMT_SHORT) > > break; > > } > > - first = 0; > > > > strbuf_grow(sb, linelen + indent + 20); > > if (indent) { > > I have to wonder if this regresses the normal codepath to > cleanse commit messages that have extra blanks at the > beginning. When we discussed this ages ago, I think we came to the conclusion that it didn't matter. The code doesn't remove extra blank lines from between body paragraphs, so it's a bit arbitrary to remove them between the first line and the following paragraph. And people tend not to have commit messages with blank lines there (in fact, I think git strips them out on commit). -Daniel *This .sig left intentionally blank* ``` ## Junio C Hamano, 2008-02-07 09:09 Subject: Re: [PATCH 3/4] Retain extra blank lines between the summary and the body Message-ID: <7vsl05nnds.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsl05nnds.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Daniel Barkalow writes: > When we discussed this ages ago, I think we came to the conclusion that it > didn't matter. The code doesn't remove extra blank lines from between body > paragraphs, so it's a bit arbitrary to remove them between the first line > and the following paragraph. And people tend not to have commit messages > with blank lines there (in fact, I think git strips them out on commit). Ah, then "Stripping only at the beginning is inconsistent and wrong" would be a better description. Then that's fine by me in either case. Thanks for a reminder. ```