[sos-devel] [PATCH 1/4] postgresql: minor fixes

[Sandro Bonazzola]

Il 04/02/2014 16:20, Bryn M. Reeves ha scritto:
> On 02/04/2014 02:57 PM, Sandro Bonazzola wrote:
>> - pep8 / style fixes
>> - Avoid redefining built-in 'file'
>>
>> Change-Id: I240268e0ce90328d09854d9825f9e06ef07a7f4f
>> Signed-off-by: Sandro Bonazzola <sbonazzo at redhat.com>
> 
> Thanks - applied the series. There seems to be something in your patch
> generation process that's leaving trailing whitespace at the end of
> lines, git doesn't like that:
> 
> $ git apply --index /tmp/postgresql-add-license-header-3_4.patch
> /tmp/postgresql-add-license-header-3_4.patch:67: trailing whitespace.
> ## Copyright (C) 2014 Red Hat, Inc., Sandro Bonazzola <sbonazzo at redhat.com>
> /tmp/postgresql-add-license-header-3_4.patch:68: trailing whitespace.
> [...]
> 
> Fixed with a quick "sed -i 's/[[:space:]]*$//'" but ideally patches
> should apply directly to git without munging.

I just used:
$ git --version
git version 1.8.1.4
$ git send-email --to=sos-devel at redhat.com --annotate HEAD~4

and saving an email as-is and running "git am" on it
works for me without any error

Let me know if I'm missing some parameters to git command line.


> 
> The four postgres patches should be visible on github now:
> 
>  https://github.com/sosreport/sosreport/commits/master
> 
> Thanks again for working on this!
> 
> Regards,
> Bryn.
> 


-- 
Sandro Bonazzola
Better technology. Faster innovation. Powered by community collaboration.
See how it works at redhat.com