added .gitattributes file #130

OskarStark · 2016-06-01T15:05:39Z

Closes #129

soullivaneuh · 2016-06-01T15:06:12Z

project/.gitattributes

@@ -0,0 +1,4 @@
+.editorconfig    export-ignore


Why not .*?

soullivaneuh · 2016-06-01T15:06:22Z

Could we add the documentation part?

soullivaneuh · 2016-06-01T15:08:10Z

project/.gitattributes

+.gitignore       export-ignore
+CONTRIBUTING.md  export-ignore
+
+/Resources/doc   export-ignore


This is not always this path. Pleas use {{ docs_path }} instead.

Example:

dev-kit/project/Makefile

Line 17 in ae18f3e

cd {{ docs_path }} && sphinx-build -W -b html -d _build/doctrees . _build/html

greg0ire · 2016-06-01T15:08:47Z

What about tests?

soullivaneuh · 2016-06-01T15:09:37Z

What about tests?

I would like #116 consensus before work on this.

OskarStark · 2016-06-01T15:12:53Z

i got this error:

oskar.stark:/Volumes/development/workspaces/dev-kit (gitattributes-file)$ git rebase -i HEAD~2
}} is not a valid attribute name: project/.gitattributes:4
}} is not a valid attribute name: project/.gitattributes:4
}} is not a valid attribute name: project/.gitattributes:4
[losgelöster HEAD 4402d52] added .gitattributes file
 Date: Wed Jun 1 17:04:46 2016 +0200
 1 file changed, 4 insertions(+)
 create mode 100644 project/.gitattributes
Successfully rebased and updated refs/heads/gitattributes-file.
oskar.stark:/Volumes/development/workspaces/dev-kit (gitattributes-file)$

greg0ire · 2016-06-01T15:15:42Z

Maybe name it .gitattributes.twig ? It will avoid git recognizing it for dev-kit. Plus it's basically a Twig file, so…

OskarStark · 2016-06-01T15:17:08Z

Maybe name it .gitattributes.twig ? It will avoid git recognizing it for dev-kit

sound good, what do you think @soullivaneuh ?

soullivaneuh · 2016-06-01T15:21:28Z

@OskarStark Yes you can. In this case, the Twig variable name would be docs_path.

OskarStark · 2016-06-01T15:27:22Z

so docs_path instead of {{ docs_path }} ?

soullivaneuh · 2016-06-01T15:28:10Z

@OskarStark Well, it's a Twig file! So AFAIK you still need to use {{ }}!

OskarStark · 2016-06-01T15:28:59Z

@OskarStark Well, it's a Twig file! So AFAIK you still need to use {{ }}!

Exactly thats why i was asking! so now we should be fine! 👍

@OskarStark Yes you can. In this case, the Twig variable name would be docs_path.

I was wondering, because this was already done at this point ;-)

soullivaneuh · 2016-06-01T15:29:12Z

project/.gitattributes.twig

@@ -0,0 +1,4 @@
+.*               export-ignore
+CONTRIBUTING.md  export-ignore


*.md? Except if somebody want to keep a specific .md file...

*.md? Except if somebody want to keep a specific .md file...

i like the idea 👍

OskarStark · 2016-06-01T15:33:08Z

i removed the indention, because we don't know the length of the docs path....

soullivaneuh · 2016-06-01T15:35:12Z

i removed the indention, because we don't know the length of the docs path....

Hmm... or we can just specify the two cases (Resources/doc and docs).

I don't think git will cry if a ignored path does not exist, will do?

OskarStark · 2016-06-01T15:37:30Z

no it won't but the indention is anyway bad if we add something like foo/bar/baz/loooonnnnggg tomorrow, the the whole file will be modified in the diff, it is the exact same problem with the double arrow align

greg0ire · 2016-06-01T15:38:15Z

What's wrong with the Twig variable?

soullivaneuh · 2016-06-01T15:39:20Z

no it won't but the indention is anyway bad

Maybe, but I never seen a .gitattributes file without indentation. I don't know if a convention exists about that file...

OskarStark · 2016-06-01T15:40:01Z

Maybe, but I never seen a .gitattributes file without indentation. I don't know if a convention exists about that file...

https://git-scm.com/book/uz/v2/Customizing-Git-Git-Attributes#Merge-Strategies

greg0ire · 2016-06-01T15:40:13Z

man gitattributes

That is, a pattern followed by an attributes list, separated by whitespaces. When the pattern matches the path in question, the attributes listed on the line are given to the path.

OskarStark · 2016-06-01T15:40:45Z

What's wrong with the Twig variable?

Nothing i thought i should change {{ docs_path }} to docs_path without the curly braces... that confused me a few seconds 😄

greg0ire · 2016-06-01T15:41:25Z

What's wrong with the Twig variable?

No I meant why not use it, but I get it know, it was all about alignment

OskarStark · 2016-06-01T15:43:36Z

for example when we use this:

foo                      export-ignore
bar                      export-ignore
{{ docs_path}}           export-ignore

this would be the result:

foo                      export-ignore
bar                      export-ignore
/Resources/docs             export-ignore

you know what i mean?

greg0ire · 2016-06-01T15:45:01Z

you know what i mean?

Yes. Headaches ahead if we do that, as you explained.

soullivaneuh · 2016-06-01T15:59:16Z

@OskarStark Looks good. Can you try it on a one of your forked sonata project?

After that, I would like @rande opinion for this before merge because I got a refusal from him last time and he broke my heart. 💔 😛

greg0ire · 2016-06-01T16:01:07Z

rande · 2016-06-02T22:11:26Z

@soullivaneuh You should also ask the community ;)

soullivaneuh · 2016-06-02T22:12:26Z

@soullivaneuh You should also ask the community ;)

Indeed, we might start a pool. I'll look for this week-end or next week. 👍

OskarStark · 2016-06-28T15:05:58Z

@OskarStark Can you remove doc from .gitattributes for now? We can merge the rest and open a new issue to vote about that.

done @soullivaneuh

soullivaneuh · 2016-06-29T08:23:18Z

Thanks @OskarStark, this will be merged soon.

If you want to, you could open an issue to discuss about documentation ignore with vote.

OskarStark · 2016-06-30T07:42:39Z

i agree with @rande that documentation could be helpful in some rare cases, so for me this is fine as a first step!

core23 · 2016-06-30T07:58:00Z

Maybe we should remove phpunit.xml.dist and Makefile too

OskarStark · 2016-06-30T07:58:41Z

sounds reasonable...

@greg0ire @soullivaneuh what do you think?

core23 · 2016-06-30T07:59:02Z

project/.gitattributes.twig

@@ -0,0 +1,2 @@
+.* export-ignore
+*.md export-ignore


When removing all Upgrade*.md and Readme.md files, we should also remove the docs.

When removing all Upgrade*.md and Readme.md files, we should also remove the docs.

Quite agree but let's discuss about this on another PR/issue! 👍

Then we should remove this entry.

@rande Talk about keeping the docs folder, not the md files. Plus, the README.md file is just a generic one with a link pointing to the online documentation.

So let's keep as is for now and launch a vote for docs folders.

greg0ire · 2016-06-30T08:00:15Z

I agree!

soullivaneuh · 2016-06-30T08:08:50Z

Maybe we should remove phpunit.xml.dist and Makefile too

Agree.

When removing all Upgrade*.md and Readme.md files, we should also remove the docs.

Quite agree but let's discuss about this on another PR/issue! 👍

OskarStark · 2016-06-30T08:09:47Z

but, if we remove the phpunit.xml.dist shouldn't we remove the tests, too ❓

soullivaneuh · 2016-06-30T08:10:37Z

but, if we remove the phpunit.xml.dist shouldn't we remove the tests, too ❓

We don't care on this case, it's applies only for tarballs, not clones.

core23 · 2016-06-30T08:13:47Z

but, if we remove the phpunit.xml.dist shouldn't we remove the tests, too ❓

We don't need the phpunit config outside the bundle, but some bundles depends on the Tests/*.php classes. Refs #179

soullivaneuh · 2016-06-30T08:14:42Z

We don't need the phpunit config outside the bundle, but some bundles depends on the Tests/*.php classes. Refs #179

Yeah, but this should be removed, shouldn't be?

core23 · 2016-06-30T08:16:04Z

Yeah, but this should be removed, shouldn't be?

Yes, but we can't remove them in all minor versions.

soullivaneuh · 2016-06-30T08:17:20Z

Yes, but we can't remove them in all minor versions.

Already discussed on the concerned issue: This have to be fixed internally on minor versions. We don't care about external usage because it should not be used at all.

core23 · 2016-07-15T04:02:02Z

We can now remove the Tests folder, it is excluded from the autoloader in all composer projects.

core23 · 2016-07-24T11:32:45Z

Ping @OskarStark

OskarStark · 2016-08-03T08:29:18Z

done @core23

OskarStark · 2016-08-12T08:56:12Z

I did everything, can you please merge this @soullivaneuh ?

OskarStark · 2016-08-22T07:14:24Z

Can we please merge this @soullivaneuh ?

OskarStark · 2016-08-30T08:07:59Z

ping @soullivaneuh

core23 · 2016-09-15T17:27:19Z

Can we merge this @soullivaneuh ?

core23 · 2016-11-04T19:00:56Z

Ping @soullivaneuh

soullivaneuh reviewed Jun 1, 2016
View reviewed changes

soullivaneuh assigned rande and soullivaneuh Jun 1, 2016

greg0ire added the RTM label Jun 28, 2016

OskarStark added enhancement and removed RTM labels Jun 30, 2016

core23 reviewed Jun 30, 2016
View reviewed changes

added .gitattributes file

07d0e64

OskarStark added the RTM label Aug 30, 2016

soullivaneuh merged commit fd4151e into sonata-project:master Nov 23, 2016

OskarStark deleted the gitattributes-file branch November 23, 2016 13:47

jorrit mentioned this pull request Aug 19, 2020

Remove development files from Composer package #826

Merged

		@@ -0,0 +1,4 @@
		.* export-ignore
		CONTRIBUTING.md export-ignore

added .gitattributes file #130

added .gitattributes file #130

Conversation

OskarStark commented Jun 1, 2016 • edited by soullivaneuh Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

soullivaneuh commented Jun 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

greg0ire commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

OskarStark commented Jun 1, 2016

greg0ire commented Jun 1, 2016 • edited Loading

OskarStark commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

OskarStark commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

OskarStark commented Jun 1, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OskarStark commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

OskarStark commented Jun 1, 2016

greg0ire commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

OskarStark commented Jun 1, 2016

greg0ire commented Jun 1, 2016 • edited Loading

OskarStark commented Jun 1, 2016

greg0ire commented Jun 1, 2016

OskarStark commented Jun 1, 2016 • edited Loading

greg0ire commented Jun 1, 2016

soullivaneuh commented Jun 1, 2016

greg0ire commented Jun 1, 2016

rande commented Jun 2, 2016

soullivaneuh commented Jun 2, 2016

OskarStark commented Jun 28, 2016

soullivaneuh commented Jun 29, 2016

OskarStark commented Jun 30, 2016

core23 commented Jun 30, 2016

OskarStark commented Jun 30, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

greg0ire commented Jun 30, 2016

soullivaneuh commented Jun 30, 2016

OskarStark commented Jun 30, 2016

soullivaneuh commented Jun 30, 2016 • edited Loading

core23 commented Jun 30, 2016

soullivaneuh commented Jun 30, 2016

core23 commented Jun 30, 2016

soullivaneuh commented Jun 30, 2016

core23 commented Jul 15, 2016

core23 commented Jul 24, 2016

OskarStark commented Aug 3, 2016

OskarStark commented Aug 12, 2016

OskarStark commented Aug 22, 2016

OskarStark commented Aug 30, 2016

core23 commented Sep 15, 2016

core23 commented Nov 4, 2016

OskarStark commented Jun 1, 2016 •

edited by soullivaneuh

Loading

greg0ire commented Jun 1, 2016 •

edited

Loading

OskarStark commented Jun 1, 2016 •

edited

Loading

greg0ire commented Jun 1, 2016 •

edited

Loading

OskarStark commented Jun 1, 2016 •

edited

Loading

soullivaneuh commented Jun 30, 2016 •

edited

Loading