Closed (fixed)
Project:
Drupal.org infrastructure
Component:
Git
Priority:
Major
Category:
Bug report
Assigned:
Issue tags:
Reporter:
Created:
18 Dec 2010 at 05:51 UTC
Updated:
3 Jan 2014 at 02:41 UTC
Jump to comment: Most recent
I was trying to setup a devel environment for a drupal 7 project. I found that the drupal 7.x branch is missing .htaccess file.
Do this to dupicate:
git clone git://git.drupal.org/project-stable/drupal.git
cd drupal
git checkout '7.x'
ls -la .htaccess
No file.
Comments
Comment #1
rfayEither you know something I don't or you need a new technique:
git clone git://drupal.org/project/drupal.git #not sure where you got project-stable?
cd drupal
ls -l .htaccess
.htaccess is there.
There is not yet a 7.x version of drupal, so
git branch -r
won't show one. 7.x is still "master", although that probably won't be true in the future. (we will use named branches for everything and lose the technique of having "master" or "HEAD" be the current working branch.
If you wanted to create a local tracking branch for Drupal 6.x, you would do
git checkout --track origin/6.x
For a discussion of a transitional workflow that several people are using, you may want to check out http://groups.drupal.org/node/91424.
Comment #2
gopherspidey commentedI got project-stable from drush. drush was failing and I noticed some issues in the drush queue. So I thought that the drush code was bad. So I tried the git command manually, and they worked fine. That is until I was trying to get CleanUrls to work and I noticed that .htaccess was missing.
I did not figure that it was a drush issue because the repo was missing the file.
http://drupalcode.org/viewvc/drupal/contributions/modules/drush/commands...
Comment #3
rfayWell, as demonstrated, it's not a git issue. I'll be happy to help you solve this if you need help, but if it's adrush problem please move it into the drush queue.
-Randy
Comment #4
gopherspidey commentedI do not need help. I was just trying to point out that a git repo that is on the drupal.org infra has an issue. Since all the git repos are currently auto generated, I figured that it was a migration script issue that was striping out the .htaccess file.
It was more of a notice to the Git Migration Team then it was a problem of mine. I had already solved my issue by cloning from git.drupal.org/project (not project-stable)
Just trying to help! :)
Comment #5
gopherspidey commentedJust some more info about the -stable repos
#814174: Git / drupal.org integration
Comment #6
gopherspidey commentedthe script that creates the stable branch
https://github.com/damz/drupalorg-git/blob/master/stable-mirror/update-s...
Comment #7
rfayI'm still baffled. These are my questions:
* What is a "stable" branch and where did you hear about it? Got a link?
* What does it have to do with the git migration?
* Why are you quoting DamZ's github as part of the great git migration? None of that is in use for the git migration.
You seem convinced that this is a bug in the git migration, so we certainly want to know about it if it is. But you're referring to concepts and scripts that don't have to do with the git migration, as far as I can tell.
-Randy
Comment #8
sdboyer commented@rfay I should clarify here - the stable repositories are something DamZ set up long ago, and has periodically updated since to keep up with changes in the other migration scripts. I've never touched the scripts, and don't really talk about them, which is probably why you haven't heard of them. The idea behind the stable repos is that instead of having the entire project's history (which means a big download on clone), they just have a single commit representing each release.
@gopherspidey - best thing to do is file a bug at DamZ's github repo. I've never worked on that script, and wouldn't have the first idea how to fix the problem. I'll also point him to this issue.
Comment #9
gopherspidey commented@rfay Sorry for the confusion. I hope Sam clarified some things that I did not have answers to.
@sdboyer I sounds like the "-stable" repos a a pet project of DamZ. Is this something that will become permanent? I am having trouble understanding the reasoning behind it. To me without the history in the repo what is the difference in the static tarballs. Easier updating?
Again, sorry for the confusion. Just trying to help!
Comment #10
damien tournoud commentedTaking this. It seems that there is an issue with committing hidden files.
@gopherspidey: those repositories are merge-friendly repositories containing (supposedly) the same content as the tarballs. They can serve as a base of pure-Git based deployment, without having to deploy in production the whole history of every project.
Comment #11
sdboyer commentedOnce we've launched, the contributions-stable system will need to get tied in with packaging to stay up-to-date. Our current timeline has dww working on those from Jan 13 to Jan 17, so I think that'd be the time to hook in (@DamZ)
Comment #12
gopherspidey commentedGlad I could help.
Comment #13
webchickThis sounds like Git Sprint 9 to me, given the packaging script stuff isn't scheduled to land until Sunday night.
Comment #14
sdboyer commentedThe stable repos aren't critical to launch, so untagging.
@DamZ - that doesn't mean I'm opposed to them going in with launch. But they're really your area, so if they're going to happen then we need to have a conversation about integrating them, and they need to be tested & in full working order by the end of next week.
Comment #15
Anonymous (not verified) commentedWhen I look at the project-stable update script in #6,
I notice the following in line 162:
162 git_invoke('git add *');
'git add *' doesn't include hidden (dotted) files, which could explain the missing .htaccess file.
If this really is the case, the issue could be solved by adding the following line:
163 git_invoke('git add .');
I have two reasons for using project-stable instead of project:
1. Drush uses project-stable. Although this can be overridden with the --dev option, I couldn't get anything but the latest development tree
2. The project tree is 59M in size, whereas project-stable only takes up 13M. Not a big issue if you have ample diskspace, but it matters if space is an issue.
Gertjan Idema
Comment #16
damien tournoud commentedFixed this. Stoned the drupal repository (which is the only one that is likely to have a top-level hidden file), and relaunched the import process. It is currently rebuilding.