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

Thomas Monjalon thomas at monjalon.net
Fri Nov 13 10:43:38 CET 2020


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?




More information about the dev mailing list