git

This is a step-by-step guide to getting GIT working in Windows.
Note that what follows a $ is what you should type after the BASH $ command prompt.
I recommend taking a look at this great set of video tutorials about git.

Download and install git for Windows here.
Signup for github.com to store your git repositories conveniently online. (Micro service is $7/month at time of writing, 22/9/12) Alternately, bitbucket.org provides free private git repositories for up to five users.

Sign into the github application with your github.com account at the top right of the application window.
Create a new repository in the github application and make the first commits that the github application prompts you to: .gitattributes and .gitignore.

Configuring git on your local server

Make sure that git is installed on your server. I did this by installing the git web application in the Webfaction (my host) control panel.
Open the gitbash program. This will give you the $ command line.
Add your name: $ git config --global user.name “Your Name”
Add your e-mail: $ git config --global user.email “your.email@example.com”
See the details that you have entered: $ cat ~/.gitconfig

For git you need the "GIT backend" module.

Here is an example of using GIT backend:

Step 1: create an bare GIT repository (skip this if you already have one)

Step 2: set up your Drupal site with that repository

1. Enable the "Version Control API", "Commit Log" and "GIT backend" modules.
2. Flush cache.
3. Go to Configuration > Development > Version Control settings (url: /admin/config/development/versioncontrol-settings)
4. Set "Git binary path". (Notice: Can be problems with Windows OS. On *nix OS there are no problems with path)
5. Go to Content > VCS repositories > Add Git repository in the admin area. (url: /admin/content/versioncontrol-repositories/add-git)
6. Repository name: "Test repo", or whatever.
7. Repository root: "/path/to/repository/bare.git".
8. For other settings follow fields descriptions(and check "Web viewer URL handler" because by default it's not set. Might it'll be fixed in closest time)
9. Save the repository.
10. Enable the "Commit messages" menu entry, or go directly to the "/commitlog" path.

For twig we had the problem that the basic patch was not accepted, but that the followup issues should be clean.

The idea is to use two patches within one.

What do you do if you happen to find a patch with two patches in one?

Patch contributors

For patch contributors the workflow is not that difficult to the regular patches:

Assuming origin is the "core" repository and you work in feature branches the workflow is:

Lets further assume the patch is in issue 1806546 with comment number 4

Getting a clean branch:

Applying the current patch:

Now you add your changes and then you do:

A small shell function which linkifies git log output.
Modified from Ben Almans github version

• drupalcode.org commit link
• drupalcode.org blob links
• drupal.org issue link if the commit message is formatted as Issue #123456

Note! This has only been tested on Ubuntu. I have a slight feeling less -R might not exist on osx.

This page explains how you can use TortoiseGit under Microsoft Windows to contribute code to Drupal.org.

Other pages in this handbook explain how to install and configure TortoiseGit, and the differences between git and tradional versioning systems like SVN.

Requirements:

• You have requested and received git access.
• You have created a project.
• You have registered your public key with your drupal.org account.
• You have installed and configured TortoiseGit.

Now:

1. Create an empty directory where the repository of your project should live. (If you already have files for your project, you can add them here later.)

2. Right click the repository directory you have just created and choose "Git Create repository here..." as shown below:

TortoiseGit should reply by saying that an empty repository has been created. The result is that you now have a directory that functions as a local git repository.

3. Create your project files in the repository directory or copy existing project files there.

4. Once you have at least one file in the repository directory, commit it. You do this as follows.

• Right click the file(s).

Aliases

git aliases are a powerful way to streamline your most frequent git operations. Read a basic tutorial here. Git Immersion also has a section for aliases.

• git diffup: Create full patch, interdiff.txt, and commit log in one shot for sandbox patches.

  Applies to:

  • Larger or more complex core patches, which are developed and improved in a sandbox branch.

  Assumptions:

  • You won't push commits upstream before you create a patch for a d.o issue.
  • You want to combine and enforce best practices:
    1. Obviously, providing interdiffs for others.
    2. Doing atomic and clean commits.
    3. Writing proper commit messages.
       (The shortlog can be copied 1:1 into an issue comment.)
  • Your local branch foo tracks the upstream mysandbox/foo branch.

    To configure/enforce this for existing branches:
    

    git branch --set-upstream foo mysandbox/foo

  Alias:
  

  git config --global alias.diffup '!git log --oneline --reverse @{u}... && git diff 8.x... > $1 && git diff @{u} > interdiff.txt && echo'

  Explanation: