[dpdk-dev] [kmods PATCH v2] windows: normalize line-endings

[Luca Boccassi]

On Fri, 2020-11-13 at 10:43 +0100, Thomas Monjalon wrote:
> 13/11/2020 08:06, Dmitry Kozlyuk:
> > Hi Luca,
> > 
> > Thank you for taking the initiative. However, the patch fails to apply on my
> > system, and that's the reason I've been delaying my own):
> > 
> > $ git am \[kmods\ PATCH\ v2\]\ windows:\ normalize\ line-endings 
> > Applying: windows: normalize line-endings
> > error: windows/virt2phys/virt2phys.sln: does not match index
> > error: windows/virt2phys/virt2phys.vcxproj: does not match index
> > error: patch failed: windows/virt2phys/virt2phys.vcxproj.filters:1
> > error: windows/virt2phys/virt2phys.vcxproj.filters: patch does not apply
> > Patch failed at 0001 windows: normalize line-endings
> > 
> > As far as I understand, this is caused by removed BOM: it exists in the repo,
> > so it is included in the patch, but it's absent from checked-out files, so the
> > patch fails to apply. Either there is some git option we're missing or only
> > committer (i.e. Thomas) can do the conversion. It is correct to remove BOM.
> > Note that \No newline at end of file will be restored by Visual Studio on
> > save.
> 
> What is BOM?

Last try: I split the patch, and first the gitattributes file is
removed. I believe that's what stops the patch from being applicable.
Also removed the bit in the README.

Thomas, I think if v3 is still not enough and there's still a dos2unix
diff, then it means we can't do this change via patches, but it has to
be done directly on your repo and pushed.

-- 
Kind regards,
Luca Boccassi