Git Walkthrough

This is a first draft, very basic guide how to get GIT setup on windows or osx, and commit code to TEST.

Documentation:

http://docs.moodle.org/en/Development:Quick_Git_start_guide_for_Moodle_development

Setting up the Environment

Windows

Install msysgit

Download latest version from http://code.google.com/p/msysgit/downloads/list (ie: Git-1.7.4-preview20110204.exe)
check “Git Bash Here”
check “Git GUI Here”

Run Git from the Windows Command Prompt

checkout as-is, commit unix-style line endings

Install tortoise

OpenSSH, git default ssh client

Mac OSX

Install Git for OSX:

Standalone package:
- Grab the latest git installer for your version of osx from Git for OSX
- Run the contained pkg
- If you want git to be accessible via the PATH and MANPATH variables for non-terminal programs, run the included shell script.
MacPorts:
- sudo port install git-core

Generate an SSH Key:

Follow the directions here: Mac Key Setup

Configure Line Endings

In order to avoid issues with line endings when cloning on to Windows machines, follow the directions here: Dealing with line endings

Setting up Git global configs

Before making commits, it is useful to add your name and email:

git config —global user.name “Your Name”
git config —global user.email “yourmail@domain.tld”

If you connect to github without ssh you might need a token:

Follow the directions here: Email Settings

Setting up github repository:

Go to https://github.com/moodle/moodle, click “fork”
Got to Admin→Collaborators→Add (add any number of collaborators to the project)
Checkout a local copy of the forked code: git clone https://YOUR_GITHUB_USERNAME@github.com/ucla/moodle.git ./YOUR_LOCAL_MOODLE_FOLDER/

Execute the following commands:

git branch TEST
git push origin TEST
git branch STAGE
git push origin STAGE
git branch SSC
git push origin SSC

New Features

git clone https://YOUR_GITHUB_USERNAME@github.com/ucla/moodle.git ./YOUR_LOCAL_MOODLE_FOLDER/
git checkout DEV
git checkout -b <feature_name>
change file
git commit -a -m "updating README.txt to include basic git instructions"
git push origin <feature_name>
(Repeat above 3 steps as needed)
git rebase origin/DEV
git checkout DEV
git merge --squashno-ff <feature_name>

git commit -m <message>
git push origin DEV

Bug Fixes

git clone https://YOUR_GITHUB_USERNAME@github.com/ucla/moodle.git ./YOUR_LOCAL_MOODLE_FOLDER/
git checkout DEV
change file
git commit -a -m "updating README.txt to include basic git instructions"
git push origin DEV

Get changes onto TEST

git checkout TEST
git cherry-pickmerge e9cb5

--no-ff

git cherry-pick d40dc

~~Repeat as necessary to get all the changes~~

git pull origin TEST<feature_name>
git push origin TEST

Get changes onto STAGE

git checkout STAGE

git merge --no-ff <feature_name>

git push origin STAGE

Get changes onto master

git checkout master

git merge --no-ff <feature_name>

git push origin master

Get changes onto SSC

git checkout SSC

git merge --no-ff <feature_name>

git push origin SSC

Updating DEV from moodle.org

git checkout DEV
git remote add upstream https://github.com/moodle/moodle.git
git fetch upstream
git merge -m "upgrading Moodle to version X.Y" <commit_hash>
START RESOLVE CONFLICTS
git add <conflicted_file>
git add <conflicted_file>
git commit -m "upgrading Moodle to version X.Y"
DONE RESOLVE CONFLICTS
git push origin DEV

Back to top