[dpdk-dev] [kmods PATCH] windows: normalize line-endings
Luca Boccassi
bluca at debian.org
Wed Nov 11 16:02:43 CET 2020
On Tue, 2020-11-03 at 10:05 +0000, Luca Boccassi wrote:
> On Tue, 2020-11-03 at 10:42 +0300, Dmitry Kozlyuk wrote:
> > Hi Naty,
> >
> > > Doesn't the 'input' option gets you original (unmodified) line endings on checkout?
> > > If a file in the repo has CRLF endings, Unix devs will get it as-is (with CRLF), right?
> >
> > The "input" option is for Unix devs only.
> >
> > > Regardless, this is the best option for Unix and since we're normalizing line endings for
> > > existing files, Unix devs should get LF on checkout.
> > > I will send a patch to normalize netuio as well.
> >
> > AFAIK, you don't need to. Whatever you settings were when committing netuio,
> > it now checks out with CRLF on Windows (core.autocrlf=true, installer
> > default) and with LF on Linux (core.autocrlf=input, although unset also
> > works). I'd wait for confirmation from Luca, though.
>
> Hi,
>
> Thank you for looking into this. Yes the netuio folder is ok as-is:
>
> $ dos2unix -id windows/netuio/netuio.vcxproj* windows/netuio/netuio.sln
> 0 windows/netuio/netuio.vcxproj
> 0 windows/netuio/netuio.vcxproj.filters
> 0 windows/netuio/netuio.sln
>
> The patch looks good to me, as I really need all files to be checked in
> with LF only as a hard requirement before I can upload to
> Debian/Ubuntu, so:
>
> Acked-by: Luca Boccassi <bluca at debian.org>
>
> Does the change also stop future check-ins of CRLF files?
Thomas pointed out that this patch still doesn't fix everything,
there's still a few CLRF around. I must have applied by mistake on a
branch where I was working on, with manual fixes, sorry for the
confusion.
Eg, with this patch applied, the diff of dos2unix is still not empty:
$ dos2unix windows/virt2phys/*
dos2unix: converting file windows/virt2phys/virt2phys.c to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.h to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.inf to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.sln to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.vcxproj to Unix
format...
dos2unix: converting file windows/virt2phys/virt2phys.vcxproj.filters
to Unix format...
$ git status
HEAD detached from origin/main
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: windows/virt2phys/virt2phys.sln
modified: windows/virt2phys/virt2phys.vcxproj
modified: windows/virt2phys/virt2phys.vcxproj.filters
Could you please send a v2 with a run of dos2unix on _all_ the files?
This is a blocker for me, I cannot upload 20.11 to Debian and Ubuntu
until I have the kmods package ready, and I cannot upload this package
until this issue is fixed.
--
Kind regards,
Luca Boccassi
More information about the dev
mailing list