DPDK patches and discussions
 help / color / mirror / Atom feed
From: Luca Boccassi <bluca@debian.org>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
	Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
Cc: dev@dpdk.org, John Alexander <John.Alexander@datapath.co.uk>
Subject: Re: [dpdk-dev] [kmods PATCH] windows: normalize line-endings
Date: Wed, 11 Nov 2020 15:02:43 +0000
Message-ID: <a15dde7c6660007be1d4ad7c2b202fcb130cabb0.camel@debian.org> (raw)
In-Reply-To: <e706aa32aade7232f697795d8177e186ac1b7607.camel@debian.org>

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@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

  reply	other threads:[~2020-11-11 15:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-29 22:55 Dmitry Kozlyuk
2020-11-03  4:05 ` Narcisa Ana Maria Vasile
2020-11-03  7:42   ` Dmitry Kozlyuk
2020-11-03 10:05     ` Luca Boccassi
2020-11-11 15:02       ` Luca Boccassi [this message]
2020-11-11 15:11       ` Dmitry Kozlyuk
2020-11-03 20:49 ` Narcisa Ana Maria Vasile
2020-11-11 15:02 ` Thomas Monjalon
2020-11-11 15:03   ` Luca Boccassi
2020-11-11 15:09     ` Luca Boccassi
2020-11-12 20:16       ` Luca Boccassi
2020-11-12 20:15 ` [dpdk-dev] [kmods PATCH v2] " luca.boccassi
2020-11-12 23:17   ` Thomas Monjalon
2020-11-13  7:06   ` Dmitry Kozlyuk
2020-11-13  9:43     ` Thomas Monjalon
2020-11-13  9:52       ` Luca Boccassi
2020-11-13  9:50 ` [dpdk-dev] [kmods PATCH v3 1/2] windows: remove .gitattributes luca.boccassi
2020-11-13  9:50   ` [dpdk-dev] [kmods PATCH v3 2/2] windows: normalize line-endings luca.boccassi
2020-11-13 15:12     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a15dde7c6660007be1d4ad7c2b202fcb130cabb0.camel@debian.org \
    --to=bluca@debian.org \
    --cc=John.Alexander@datapath.co.uk \
    --cc=dev@dpdk.org \
    --cc=dmitry.kozliuk@gmail.com \
    --cc=navasile@linux.microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git