Re: [PATCH] Document that a patch should be submitted to the list as an attachment

Hi

On Tuesday, October 11, 2016, Chris Mayo <aklhfex(at)gmail(dot)com> wrote:

> On 11/10/16 15:34, Dave Page wrote:
> > Hi
> >
> > On Monday, October 10, 2016, Chris Mayo <aklhfex(at)gmail(dot)com
> <javascript:;> <mailto:aklhfex(at)gmail(dot)com <javascript:;>>> wrote:
> >
> > Signed-off-by: Chris Mayo <aklhfex(at)gmail(dot)com <javascript:;>
> <javascript:;>>
> > ---
> > docs/en_US/submitting_patches.rst | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> >
> > This doesn't apply - can you rebase it please?
> >
> > Thanks.
> >
> > (pgadmin4)snake:pgadmin4 dpage$ git apply ~/Downloads/0001-Document-
> that-a-patch-should-be-submitted-to-the-lis.patch
> > /Users/dpage/Downloads/0001-Document-that-a-patch-should-
> be-submitted-to-the-lis.patch:13: trailing whitespace.
> > the chances of it being rejected. Once you're happy with your work, mail
> it
> > /Users/dpage/Downloads/0001-Document-that-a-patch-should-
> be-submitted-to-the-lis.patch:14: trailing whitespace.
> > as an attachment to the mailing list pgadmin-hackers(at)postgresql(dot)org
> <javascript:;> <mailto:pgadmin-hackers(at)postgresql(dot)org <javascript:;>>.
> > /Users/dpage/Downloads/0001-Document-that-a-patch-should-
> be-submitted-to-the-lis.patch:15: trailing whitespace.
> > Please ensure you include a full description of what the patch does,
> > /Users/dpage/Downloads/0001-Document-that-a-patch-should-
> be-submitted-to-the-lis.patch:16: trailing whitespace.
> > as well as the rationale for any important design decisions.
> > error: patch failed: docs/en_US/submitting_patches.rst:30
> > error: docs/en_US/submitting_patches.rst: patch does not apply
> >
>
> I checked and I can't see anything wrong. I also tried downloading the
> patch from the web archive and using git apply.
>
> The "trailing whitespace" errors may suggest the problem - the added lines
> in the patch don't have any whitespace.
> Have you been near a Windows machine? I used unix2dos on the patch and
> then got the same result as above.
>

No, I've only been on my Mac. Your suggestion made me think though - I
opened the patch in my editor, and it claims the original had Windows line
endings. I converted them to \n and it applied just fine.

What does 'git config core.autocrlf' output for you?

In any case, I applied the patch. Thanks!

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company