Pending

User tests: Successful: Unsuccessful:

avatar jlleblanc
jlleblanc
4 Oct 2011

Added configuration.php to .gitignore.

avatar jlleblanc jlleblanc - open - 4 Oct 2011
avatar eddieajau
eddieajau - comment - 7 Oct 2011

I'd recommend taking .gitignore out of the tree so that devs can add arbitrary stuff.

avatar jlleblanc
jlleblanc - comment - 7 Oct 2011

It's still possible to add arbitrary stuff to .gitignore, even with an existing one in place. I think that for the majority of the people cloning from GitHub, having a .gitignore file with configuration.php (and possibly the tmp, cache, & administrator/cache folders) would be most useful. If we distribute without a .gitignore, people adding one will run into essentially the same issue: .gitignore will appear as an unstaged change or addition.

On Oct 6, 2011, at 7:34 PM, Andrew Eddie wrote:

I'd recommend taking .gitignore out of the tree so that devs can add arbitrary stuff.

Reply to this email directly or view it on GitHub:
#3 (comment)

avatar eddieajau
eddieajau - comment - 7 Oct 2011

Mmmm, but wouldn't you just ignore the .gitignore? I've just had trouble trying to untrack it and then change branches. Git tends to complain about that.

avatar mahagr
mahagr - comment - 7 Oct 2011

I agree. Changing ignore files is mandatory in this tree for example if you are also testing your own extensions and you really don't want to have those in CMS branch. :)

By default eGit adds ignore files to the ../target directory, so it would be easy to add a rule that ignores all the other .ignore files and have basic stuff in the main ignore. After that you could just ignore .ignore and edit it from github..

avatar mbabker
mbabker - comment - 7 Oct 2011

Personally, I'd prefer to see a default .gitignore similar to the SVN's ignore ruleset. If devs want more, then they can handle it themselves, but a good template to start with is always nice.

avatar eddieajau
eddieajau - comment - 7 Oct 2011

I'd have no problem adding a gitignore-dist file. I think that would be a good idea.

avatar jlleblanc
jlleblanc - comment - 7 Oct 2011

RE, testing extensions: I personally prefer to see those as unstaged changes. They server as a reminder that "hey, this isn't a clean copy of Joomla."

I'll leave it at this though: I'd prefer to see .gitignore ready to go for the majority of us doing feature adds and bug fixes. I can see the case for leaving it out (or doing gitignore-dist), but I think that including it will make it easier for people to get their commits out there without issues.

avatar elinw
elinw - comment - 7 Oct 2011

Hi,

Joe, once there is agreement on this would you please make a patch and post it on joomlacode? That is the only way that changes are coming in at this point. Otherwise this change will have to wait until the next stage of migration which is not going to happen at minimum until there is documentation of JBS process as done on github is available on the joomla wiki.

avatar jlleblanc
jlleblanc - comment - 7 Oct 2011

Since this commit solely concerns the configuration of Git, it doesn't make sense to post it over at JoomlaCode. If the change has to wait, we can wait.

On Oct 7, 2011, at 10:31 AM, elinw wrote:

Hi,

Joe, once there is agreement on this would you please make a patch and post it on joomlacode? That is the only way that changes are coming in at this point. Otherwise this change will have to wait until the next stage of migration which is not going to happen at minimum until there is documentation of JBS process as done on github is available on the joomla wiki.

Reply to this email directly or view it on GitHub:
#3 (comment)

avatar elinw
elinw - comment - 7 Oct 2011

Well it does in that the only way commits are being made to github is via committers reviewing patches at joomlacode. But it's up to you.

avatar realityking
realityking - comment - 7 Oct 2011

IMO the .gitignore file is meant to be shared. Things only you need to exclude but no one else can go into .git/info/exclude

avatar jlleblanc
jlleblanc - comment - 7 Oct 2011

@realityking I had forgotten about .git/info/exclude. In that case, I'd strongly prefer to have configuration.php and those three folders in a standard, distributed .gitignore file.

avatar realityking
realityking - comment - 7 Oct 2011

What three folders are you referring too?

Also I'd suggest changing the line to
/configuration.php

This will only exclude the file if it's at the repro's root. Oh and please add a new line at the end of the file.

avatar jlleblanc
jlleblanc - comment - 9 Oct 2011

@realityking I've updated the pull request with your suggestions, along with the three folders (/tmp, /cache, /administrator/cache). Since there are already index.html files being tracked in these three folders, they'll still get cloned in Git. However, any files that get added to those folders will be ignored. So I think we have it covered.

Also added a newline :)

avatar tuum tuum - reference | - 8 Dec 11
avatar tuum tuum - reference | - 10 Dec 11
avatar cspratt cspratt - reference | - 5 Feb 12
avatar mbabker mbabker - close - 28 Dec 2012
avatar mbabker
mbabker - comment - 28 Dec 2012

I think 06157ec has this one covered quite well, so closing the oldest open item here ;-)

avatar juliopontes juliopontes - reference | - 6 Mar 13
avatar dextercowley dextercowley - reference | - 11 Apr 13
avatar janich janich - reference | - 21 Jun 13
avatar nonumber nonumber - reference | - 26 Jun 13
avatar sanderpotjer sanderpotjer - reference | - 9 Jul 13
avatar garyamort garyamort - reference | - 2 Dec 13
avatar garyamort garyamort - reference | - 2 Dec 13
avatar wilsonge wilsonge - reference | d2036af - 12 Mar 14
avatar N6REJ N6REJ - reference | 983e827 - 6 Jan 15
avatar wilsonge wilsonge - reference | cc28eba - 22 Mar 15
avatar photodude photodude - reference | e6fe557 - 15 May 15
avatar photodude photodude - reference | a7fdd61 - 24 May 15
avatar photodude photodude - reference | 9ad8fe2 - 25 May 15
avatar photodude photodude - reference | 94efb84 - 25 May 15
avatar photodude photodude - reference | 61f2545 - 29 May 15
avatar photodude photodude - reference | 93bd956 - 29 May 15
avatar photodude photodude - reference | 9a2651a - 31 May 15
avatar photodude photodude - reference | fdbdef7 - 31 May 15
avatar photodude photodude - reference | 31363f1 - 1 Jun 15
avatar photodude photodude - reference | 1ecf55c - 13 Jun 15
avatar photodude photodude - reference | 804865d - 20 Jun 15
avatar photodude photodude - reference | ad86a0c - 22 Jun 15
avatar photodude photodude - reference | 4bbe8bd - 26 Jun 15
avatar photodude photodude - reference | c43f599 - 10 Jul 15
avatar photodude photodude - reference | 5bd9c4f - 16 Jul 15
avatar wojsmol wojsmol - reference | b211287 - 18 Jul 15
avatar photodude photodude - reference | 2fa83cd - 26 Jul 15
avatar photodude photodude - reference | 8135d10 - 27 Jul 15
avatar photodude photodude - reference | a374f1f - 28 Jul 15
avatar photodude photodude - reference | 086d139 - 5 Aug 15
avatar photodude photodude - reference | d79f227 - 9 Aug 15
avatar photodude photodude - reference | 02ff698 - 11 Aug 15
avatar photodude photodude - reference | 79b31ee - 13 Aug 15
avatar rdeutz rdeutz - reference | 6d8f1b7 - 10 Nov 15
avatar zjw zjw - reference | d800cf8 - 21 Nov 15
avatar wilsonge wilsonge - reference | 6f62732 - 14 Feb 16

Add a Comment

Login with GitHub to post a comment