From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Geordan Neukum <gneukum1@gmail.com>, barebox@lists.infradead.org
Cc: Ian Abbott <abbotti@mev.co.uk>, u.kleine-koenig@pengutronix.de
Subject: Re: [PATCH v2] LICENSES: modify .gitignore files to be nonempty
Date: Wed, 15 May 2019 10:54:06 +0200 [thread overview]
Message-ID: <7e9d7f69-0fc9-595e-db2b-51f6fb5c60f5@pengutronix.de> (raw)
In-Reply-To: <CA+T6rvF1oeEWYHKfD0P9s8jmAoQM5Bptyi+agomhWqPs8uK_rQ@mail.gmail.com>
Hello Geordan,
On 15/5/19 02:45, Geordan Neukum wrote:
>> If the .gitignore is currently only needed as a placeholder to avoid the
>> directory being empty, it could be a file that git does not care about
>> at all. Common names for such a file seem to include '.keep' and
>> '.gitkeep'.
>
> Fair enough. As Ahmad suggested earlier, I was attempting to force a
> cleanup of this file in the future as the new licenses are added. If we
> feel strongly enough against using a .gitignore for this purpose, I would
> be happy to resubmit the patch using another strategy. A README may also
> suffice as a visible reminder that this is only intended to be a temporary
> workaround.
I now think we should just delete these directories. We already patch
checkpatch.pl, so why not patch spdxcheck.py as well and be done with it..
I will send out a patc hset for removing the directories along with
a checkpatch.pl update shortly.
Thanks for raising the issue.
Cheers
Ahmad
>
> Best,
> Geordan
>
> On Tue, May 14, 2019 at 12:51 PM Ian Abbott <abbotti@mev.co.uk> wrote:
>>
>> On 14/05/2019 09:28, Ahmad Fatoum wrote:
>>> On 14/5/19 09:28, Ian Abbott wrote:
>>>> On 14/05/2019 03:19, Geordan Neukum wrote:
>>>>> The .gitignore files under the LICENSES/exceptions and LICENSES/other
>>>>> directories cannot have a size of 0 or else they are subject to removal
>>>>> by the make target 'distclean'. Modify the .gitignore files to
>>>>> ignore all files except for themselves. These .gitignores can be
>>>>> updated further or removed outright as new licenses are added to these
>>>>> directories in the future.
>>>>>
>>>>> Signed-off-by: Geordan Neukum <gneukum1@gmail.com>
>>>>> ---
>>>>> LICENSES/exceptions/.gitignore | 4 ++++
>>>>> LICENSES/other/.gitignore | 4 ++++
>>>>> 2 files changed, 8 insertions(+)
>>>>>
>>>>> diff --git a/LICENSES/exceptions/.gitignore b/LICENSES/exceptions/.gitignore
>>>>> index e69de29bb..d5e7eacf3 100644
>>>>> --- a/LICENSES/exceptions/.gitignore
>>>>> +++ b/LICENSES/exceptions/.gitignore
>>>>> @@ -0,0 +1,4 @@
>>>>> +# Ignore everything in this directory
>>>>> +*
>>>>> +# Except for this file
>>>>> +!.gitignore
>>>>> diff --git a/LICENSES/other/.gitignore b/LICENSES/other/.gitignore
>>>>> index e69de29bb..d5e7eacf3 100644
>>>>> --- a/LICENSES/other/.gitignore
>>>>> +++ b/LICENSES/other/.gitignore
>>>>> @@ -0,0 +1,4 @@
>>>>> +# Ignore everything in this directory
>>>>> +*
>>>>> +# Except for this file
>>>>> +!.gitignore
>>>>>
>>>>
>>>> I may be missing something, but why not have just a comment line?
>>>>
>>>
>>> One side effect of doing it this way, that it's more likely to remind,
>>> whoever `git add`s files to these directories that the .gitignore needs to
>>> be removed (unless they have aliased git add to git add -f..).
>>
>> It may confuse some people for a while, until they figure out what is
>> preventing them from adding their file to git.
>>
>>> Personally, I am fine with both ways, but I would prefer the comment
>>> to say something along the lines of:
>>>
>>> # Placeholder as upstream checkpatch.pl requires this directory to exist
>>> # This file can be removed when new files are added
>>
>> If the .gitignore is currently only needed as a placeholder to avoid the
>> directory being empty, it could be a file that git does not care about
>> at all. Common names for such a file seem to include '.keep' and
>> '.gitkeep'.
>>
>> --
>> -=( Ian Abbott <abbotti@mev.co.uk> || Web: www.mev.co.uk )=-
>> -=( MEV Ltd. is a company registered in England & Wales. )=-
>> -=( Registered number: 02862268. Registered address: )=-
>> -=( 15 West Park Road, Bramhall, STOCKPORT, SK7 3JZ, UK. )=-
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-05-15 8:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-12 22:17 distclean removing LICENSES .gitignores Geordan Neukum
2019-05-13 15:05 ` Ahmad Fatoum
2019-05-14 2:19 ` [PATCH] LICENSES: modify .gitignore files to be nonempty Geordan Neukum
2019-05-14 7:28 ` Ian Abbott
2019-05-14 8:28 ` Ahmad Fatoum
2019-05-14 12:51 ` Ian Abbott
2019-05-15 0:45 ` [PATCH v2] " Geordan Neukum
2019-05-15 8:54 ` Ahmad Fatoum [this message]
2019-05-15 0:56 ` [PATCH] " Geordan Neukum
2019-05-14 8:35 ` Uwe Kleine-König
2019-05-14 10:37 ` [PATCH v2] " Geordan Neukum
2019-05-14 11:00 ` Ahmad Fatoum
2019-05-15 7:44 ` distclean removing LICENSES .gitignores Sascha Hauer
2019-05-16 3:53 ` Masahiro Yamada
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=7e9d7f69-0fc9-595e-db2b-51f6fb5c60f5@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=abbotti@mev.co.uk \
--cc=barebox@lists.infradead.org \
--cc=gneukum1@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox