Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes: > An existing sample message (0015) in the tests for mailinfo contains an > indented line immediately after an in-body header (without any > intervening blank line). This comes from d25e5159 ("git am/mailinfo: Don't look at in-body headers when rebasing", 2009-11-20), where we want to make sure that a "From: bogosity" that isn't meant to be an in-body header is not identified as such, even when it is immediately followed by a non-blank line. "From: bogosity" is for msg0015 but the same applies to the header-looking block for msg0008. Adding a blank line there will defeat the whole point of the test, which is to make sure we don't do anything funky when --no-inbody-headers is asked for, no? > diff --git a/t/t5100/info0008--no-inbody-headers b/t/t5100/info0008--no-inbody-headers > new file mode 100644 > index 0000000..e8a2951 > --- /dev/null > +++ b/t/t5100/info0008--no-inbody-headers > @@ -0,0 +1,5 @@ > +Author: Junio C Hamano > +Email: junio@xxxxxxxxxx > +Subject: another patch > +Date: Fri, 9 Jun 2006 00:44:16 -0700 > + > diff --git a/t/t5100/msg0008--no-inbody-headers b/t/t5100/msg0008--no-inbody-headers > new file mode 100644 > index 0000000..d6e950e > --- /dev/null > +++ b/t/t5100/msg0008--no-inbody-headers > @@ -0,0 +1,6 @@ > +From: A U Thor <a.u.thor@xxxxxxxxxxx> > +Subject: [PATCH] another patch > +>Here is an empty patch from A U Thor. > + > +Hey you forgot the patch! > + > diff --git a/t/t5100/msg0015--no-inbody-headers b/t/t5100/msg0015--no-inbody-headers > index be5115b..44a6ce7 100644 > --- a/t/t5100/msg0015--no-inbody-headers > +++ b/t/t5100/msg0015--no-inbody-headers > @@ -1,3 +1,4 @@ > From: bogosity > + > - a list > - of stuff > diff --git a/t/t5100/patch0008--no-inbody-headers b/t/t5100/patch0008--no-inbody-headers > new file mode 100644 > index 0000000..e69de29 > diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox > index 8b2ae06..ba8b208 100644 > --- a/t/t5100/sample.mbox > +++ b/t/t5100/sample.mbox > @@ -656,6 +656,7 @@ Subject: check bogus body header (from) > Date: Fri, 9 Jun 2006 00:44:16 -0700 > > From: bogosity > + > - a list > - of stuff > ---