The recommended practice when developing for Drupal is not to name the branch "master", re: http://drupal.org/node/1127732
However, when people set up sandbox projects, the recipe generated by the site tells them to use "master" as branch name, see the associated screen dump (from the version control tab of the page you get when you set up a new sandbox project).
I think the procedure to set up a sandbox project, and the associated text, should be amended to agree with the current standard on this.
What is required is that the following step is inserted in the recipe just after the initial commit:
git branch -m master 7.x-1.x
And the final line in the recipe should be:
git push origin 7.x-1.x
See also: http://drupal.org/node/1819164 for an example the sort of frustration the present recipe creates.
Comment | File | Size | Author |
---|---|---|---|
Tulips.jpg | 70 bytes | dsbr | |
masterbranch.png | 18.25 KB | gisle |
Comments
Comment #0.0
gisleFixed typos.
Comment #1
gisleMoving this to what I hope is a more releveant queue.
Comment #1.0
gisleAdded suggestion for a better recipe.
Comment #2
klausiLooks like this was already fixed in project_git_instructions: http://cgit.drupalcode.org/project_git_instructions/commit/?id=252cf9089...
So it seems the only thing left to do is to deploy the latest version of that module to drupal.org?
Comment #3
jthorson CreditAttribution: jthorson commentedLooks like prod is running 7.x-1.x-dev+11, which would include this fix.
Feel free to reopen if I'm wrong. ;)
Comment #4
klausiNope, just tested this with a sandbox, the git instructions still mention the master branch: https://www.drupal.org/project/2294607/git-instructions
So maybe there is another instance of this text somewhere that we missed?
Comment #5
klausiLooks like a deployment problem. Could you check if line 886 of project_git_instructions.module is "git checkout 7.x-1.x" on prod?
Comment #6
helmo CreditAttribution: helmo commentedThe text can (and are) overridden via admin/config/project/project-git-instructions. Which is stored in the variables table. Emptying a field there resets it to the default, or just variable_del project_git_instructions_*
Comment #7
jthorson CreditAttribution: jthorson commentedYeah, that's it. I didn't check the variables.
Looks like project_git_instructions_new_maintainer and project_git_instructions_sandbox_new_maintainer are the offending overrides.
Comment #8
jthorson CreditAttribution: jthorson commentedK ... Deleted both variables. Things should be better now!
Comment #9
klausiYep, works for me. Thanks!
Comment #10
drummDeployed, so removing the tag.
Comment #12
mannemunikumar CreditAttribution: mannemunikumar commentedComment #14
apaderno(I deleted the content of an unrelated file added from an unpublished comment. I apologize for bumping this issue.)