Drupal.org Git Team

Events happening in the community are now at Drupal community events on www.drupal.org.

Welcome

The Git migration is complete, but the work is ongoing. Join us!

Drupal.org Git Team

rfay's picture

Git Transitional Workflow Discussion

Update 19 December 2010: Our git.drupal.org repositories are now updated within 5 minutes after a commit, making this workflow far more usable. All thanks to @neclimdul who bulldogged this to the ground.

Even though the Drupal CVS to Git migration will take a few more months, it's possible to start using git now for nearly everything you used to do. sirkitree challenged me to write down my workflow the other day so we could compare and contrast.

Read more
klausi's picture

Git migration for early adopters

I wrote a simple script to work with git and sync back to drupal.org CVS automatically: http://klausi.fsinf.at/git-cvs-export

So impatient people like me can move to git now and forget CVS :-) (well, not completely, you need to setup synchronization for each new branch you want to sync to CVS).

Read more
webchick's picture

Sign up here for CVS/Git new applicant code review

We talked about at the Drupalcon CPH Core Developer Summit about needing more volunteers to handle the CVS application requests queue, and in the future the Git project release review queue.

Alan Palazzolo zzolo has offered to help mentor anyone interested in taking on this critically important role.

Read more
webchick's picture

Branch/Tag naming in Git

One of the Git migration issues closed out this week was Determine branch/tag naming restrictions in Git.

The big news? All branch/tag naming restrictions at the version control system level will be lifted once we move to Git. w00t! Why is that so cool?

Currently, drupal.org CVS restricts you to branch names meeting a specific pattern (DRUPAL-6--2, DRUPAL-7--1-2-BETA1, and so on). If it doesn't match the pattern, it's rejected. This is nice for enforcing consistency in our diverse contributor community.

However, in a distributed version control system workflow, it's much more common to spin off separate branches for features, for bug fixes, or heck, just because you feel like it. And once Git is implemented, you can! Lifting this restriction is going to be pretty huge; it'll mean that going forward, Drupal developers will be able to leverage the full power of Git in their day-to-day workflow. Awesome! :D

However, in order to facilitate key community infrastructure such as Update Status and the testing bot, the tags/branches you intend to translate into actual releases (and tarballs) on Drupal.org will have to follow a consistent naming convention, similar to what's done now, but much more human-readable:

Description CVS Git
7.0-alpha6 official release (core) DRUPAL-7-0-ALPHA6 7.0-alpha6
6.x-2.3 official release (contrib) DRUPAL-6--2-3 6.x-2.3
6.x-dev release (core) DRUPAL-6 6.x
6.x-2.x-dev release (contrib) DRUPAL-6--2 6.x-2.x

So in summary, you'll have the freedom to branch early and branch often while in development, and use much less obtuse names for your tags/branches when you're ready to release. Yeehaw! Thanks a lot to sdboyer and dww for working this out!

Read more
sdboyer's picture

This week in the migration... (7/12)

I'm going to try to post these on a weekly basis, as a heads-up to the community about where things are at and what the current focus is on. The roadmap will also be kept up-to-date-ish, as best I can.

Read more
sdboyer's picture

Open Source Training Curriculum

I've been chatting with folks about this idea for a while, and it's now time to write it up and get it moving. Summary version: as part of/in tandem with the Git migration, I want to create a set of git-for-Drupal training tools. There's a particular structure I have in mind for how these tools should work:

  • First, we define our different target users/audience. For git, some the obvious groupings are "authors & maintainers" and "patch contributors"
Read more
sdboyer's picture

Migration Roadmap

While a roadmap might not be well-suited for a caterpillar striving for butterflyhood, it's absolutely necessary for this migration. There's a lot of different work that needs to be done by a lot of different people, simultaneously, and there's a lot of interdependencies between the pieces. I've now finally come up with a roadmap that lays out all those disparate areas (HUGE thanks to webchick for her help with this).

Read more

Get involved with the Git migration!

Want to help migrate drupal to git? Great! This page overviews the different parts of the migration process, with a focus on making it easy for you to jump in wherever you'd like. See the Migration Roadmap for a more in-depth overview of what the migration entails.

Read more
guysaban's picture

Valuable Online Learning Resource: GIT Book

I found the following online free book to be the most easy to understand and well clarified explanation of Git:

http://progit.org/book/

I am posting here since I really believe this will make learning GIT easy and thorough for many Drupal users. Maybe someone with a feed would consider posting it to Drupal Planet or some other more appropriate Drupal page.

I looked at many Git resources (many on the Git website) but found ProGit.org to be excellent. It really accelerated my understanding of Git.

All the best,
Guy Saban

Read more
chachasikes's picture

Designing a 'Git 101' class

Hello Git Migration Team.
I am interested in sharing plans to teach Git.

In the beginning of July, I will be teaching a Git class to students participating in a summer Drupal learning project.

This is my plan for preparing the class:
1. Personally get more up to speed with Git. I use Git already, but want to read both Git books (the O'reilly one & also the Apress book) Both are mentioned on the Drupal Git resources handbook page.

* http://drupal.org/node/783086

* http://groups.drupal.org/node/64083 (learning Git discussion)


Read more
jgrubb's picture

Git - Learning resources

Hi! I haven't seen anything mentioned here about helping folks who aren't up to speed with Git getting up to speed with Git (couldn't resist). So -

The biggies -

There's some good stuff on here, especially the Book. The Book starts at the beginning, and I can't tell you where it ends, because I just haven't had to get that far with it yet.

Read more
webchick's picture

Introductions!

Tell us a little bit about who you are, what your background is, what area you're able to help with, and most importantly, what you have time to do! :)

Read more

A detailed description of the workflows after we implemented phase 3

This is a summary and detailed implementation plan distilled of the orginal discussion over at http://groups.drupal.org/node/50438
While the orginal plan was written by CorniI, I expect this wiki page to be adjusted as we further clarify technical points. I also used content from the people contributing at the orginal wiki page.
This will then serve as a TODO list for the implementation of phase 3 of the migration to git.

In general, please fix any wording/grammar/whatever mistakes you find in here.

Read more
sdboyer's picture

Revamping Branch/Tag naming conventions - our ONE chance for a clean switch!

The branch and tag naming conventions are kinda old and crusty. Thanks to a feature of the migration script we'll be using to move to git, we have the option of changing our branch and tag conventions, and renaming all of the old crusty ones at the same time. That means we could actually do a clean migration to a new naming convention - and that we'll probably never, EVER have another opportunity to do so.

Read more

Personal sandboxes/repos/branches for issues for git

We all agree that we want some sort of github-like fork/clone to participate in a project with git.
This means, that somehow, we want to be able that, for a given project and a given issue all users which have submitted a ssh key can contribute.

What we haven't decided on is how to do that, there are several ways.

One repository per project, per user

Each user gets a clone of the main repo hosted on d.o where she can do whatever she wants to.

Read more
Subscribe with RSS Syndicate content

Drupal.org Git Team

Group organizers

Group notifications

This group offers an RSS feed. Or subscribe to these personalized, sitewide feeds: