On Tue, 19 Feb 2008, Junio C Hamano wrote: > Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: > > > + const char *body = "*** SUBJECT HERE ***\n\n\n*** BLURB HERE ***\n"; > > ... > > diff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ > > new file mode 100644 > > index 0000000..311e207 > > --- /dev/null > > +++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ > > @@ -0,0 +1,101 @@ > > +$ git format-patch --stdout --cover-letter -n initial..master^ > > +From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 > > +From: C O Mitter <committer@xxxxxxxxxxx> > > +Date: Mon, 26 Jun 2006 00:05:00 +0000 > > +Subject: [DIFFERENT_PREFIX 0/2] *** SUBJECT HERE *** > > + > > + > > +*** BLURB HERE *** > > + > > +A U Thor (2): > > + Second > > + Third > > I still disagree with your earlier point on the extra blank line > here. > > When we give commit log template, we do leave an extra blank line > before we start the template material "# Please enter ...", to > ease typing, but it is different. The template material does > not have to be removed by the end-user, so giving a blank line > upfront and starting the editor at that line is a usability > improvement, compared to the case where there is none. > > But this "*** BLURB HERE ***" needs to be removed when the user > edits the cover-letter, and I really do not see any reason to > have an extra blank line in front of it. > > Incidentally, I strongly suspect that if you do not have that > extra blank line, we would not even need to have the [PATCH 4/5] > (which is a slight regression) in the series. > > So how about this squashed in, with [PATCH 4/5] skipped? Sure. I still like the extra line, but it's not that big a deal. (And I still think it's odd that the code removes extra blank lines from that spot but not elsewhere, but likewise not a big deal) -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
