At Thu, 30 Mar 2017 15:59:14 +1100, Venkata B Nagothi <nag1010@gmail.com> wrote in <CAEyp7J-TxoLZGh2qioA9nJJepiXUvvsAWrk=BxwU0J05X_j9_A@mail.gmail.com> > Yes, downloaded from the email on Windows and copied across to Linux and > did "git apply".
The same works for me. But --keep-cr gave me the same result with you.
> $ git am --keep-cr ~/work/patches/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch > Applying: Fix a bug of physical replication slot. > .git/rebase-apply/patch:13: trailing whitespace. > /*
for me too -
[dba@buildhost postgresql]$ git am --keep-cr /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch
| --[no-]keep-cr | | With --keep-cr, call git mailsplit (see git-mailsplit[1]) with | the same option, to prevent it from stripping CR at the end of | lines. am.keepcr configuration variable can be used to specify | the default behaviour. --no-keep-cr is useful to override | am.keepcr.
I don't know why it preserves CRs only for the lines, but anyway, don't you have am.keepcr in you configuration?
May be, I do not think i have am.keepcr in my configuration. I am not 100% sure of it.
I only did "git apply.." which produced white space errors.