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).

Illustration of problem

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.

CommentFileSizeAuthor
Tulips.jpg70 bytesdsbr
masterbranch.png18.25 KBgisle
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

gisle’s picture

Project: Drupal.org site moderators » Documentation
Issue summary: View changes

Fixed typos.

gisle’s picture

Component: Textual improvements » Correction/Clarification
Status: Active » Needs review

Moving this to what I hope is a more releveant queue.

gisle’s picture

Issue summary: View changes

Added suggestion for a better recipe.

klausi’s picture

Title: Procedure to set up a sandbox diverges from Drupal git standard » Update git instructions to use 7.x-1.x branch instead of master
Project: Documentation » Drupal.org infrastructure
Component: Correction/Clarification » Git
Category: Bug report » Task
Issue summary: View changes
Issue tags: +needs drupal.org deployment

Looks 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?

jthorson’s picture

Status: Needs review » Fixed

Looks like prod is running 7.x-1.x-dev+11, which would include this fix.

Feel free to reopen if I'm wrong. ;)

klausi’s picture

Status: Fixed » Active

Nope, 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?

klausi’s picture

Looks like a deployment problem. Could you check if line 886 of project_git_instructions.module is "git checkout 7.x-1.x" on prod?

helmo’s picture

The 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_*

jthorson’s picture

Yeah, 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.

jthorson’s picture

Status: Active » Fixed

K ... Deleted both variables. Things should be better now!

klausi’s picture

Yep, works for me. Thanks!

drumm’s picture

Issue tags: -needs drupal.org deployment

Deployed, so removing the tag.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.

mannemunikumar’s picture

apaderno’s picture

(I deleted the content of an unrelated file added from an unpublished comment. I apologize for bumping this issue.)