Git

This reference is currently somewhat specific to Agaric's setup. We currently use Drush to update modules rapidly on a per-site basis (rather than updating a module in a central location and pushing it to the sites that use it), but certain modules have special needs (extra files, a patch that needs to be applied and hasn't been committed to Drupal.org version control yet) and when these modules have to be used on multiple sites, we can save time by bringing them in as submodules. Here are the notes from the first time we did this.

cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal checkout drupal
cd drupal/
git init
git add *
git status
git add .htaccess
git commit -m 'first commit of unmodified current Drupal 7 head'
git remote add origin git@github.com:benjamin-agaric/drupal-taxonomy-as-fields.git
git push origin
patch -p0 < terms_as_fields.patch
git status
git commit -a -m "bangpound's proof of concept working fundamentals of getting CCK fields for terms and deprecating taxonomy_nodeapi"
git push

Update: See Installing Drubuntu

Use the following commands to set up a development environment on Ubuntu (8.10).

If done manually, basic code is this:

On the test server:

Back in your project on your local computer:

(Some old notes from Stefan that I had to look up, so putting them online).

yesterday night i learnt some git. now i can tell you the meaning of fast-forward.
when you create a new branch off another one and after some time you want to merge the changes and the other branch hasn't advanced it's a fast forward merge. otherwise a merge commit will be crated.
if you want to merge changes to the original branch you forked off you should firts pull any changes from that one before merging or tou risk losing commits.

Git push failed.

dan@mini9:~$ sudo git clone http://git.agaricdesign.com/git/drupal-6-agaric-core.git leftysbrew
Initialized empty Git repository in /home/dan/leftysbrew/.git/
Cannot get remote repository information.
Perhaps git-update-server-info needs to be run there?
dan@mini9:~$ sudo git-update-server-info
fatal: Not a git repository

At Administer › Site configuration › Printer-friendly pages, the PDF tab will tell you:

No PDF generation tool found! Please dowload a supported PHP PDF generation tool. Check this module's INSTALL.txt for more details.

sudo git push
To /srv/git/drupal-6-agaric-core.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/srv/git/drupal-6-agaric-core.git'

Uh... right.

But do not fear! This error likely just means other changes have been made that you should pull in first.

Watch:

Easiest maybe best way is to create a new public-private key pair in Git, as mentioned in Getting Started with Git and GitHub on Windows:

ssh-keygen -C "username@email.com" -t rsa

Another fix for public key denied errors, mentioned on the GitHub discussion group, was

tuning my .ssh/config file to include these lines:

For Drupal core development in Git rather than CVS, git://github.com/mikl/drupal.git is updated every hour from Drupal.org's CVS.

Resolution