UCLA Git Walkthrough (for Moodle)

Very basic guide how to get GIT set up on Windows or OSX.

Documentation:

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

Setting up the Environment

Windows

• http://help.github.com/win-set-up-git/
• 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 want to connect to github without SSH you need a token:

• Follow the directions here: Email and Github Tokens

Setting up your Github repository:

• Go to https://github.com/moodle/moodle
  • Click “Fork”
• Got to Admin→Collaborators→Add (add any number of collaborators to the project)

Once you’ve set up your repository on Github, you need to create a clone of the repository in each instance of Moodle you want running.

Clone the repository

• With Github Token
  • git clone https://YOUR_GITHUB_USERNAMEgithub.com/ucla/moodle.git ./YOUR_LOCAL_MOODLE_FOLDER/@
• With SSH RSA-key
  • git clone gitgithub.com:ucla/moodle.git ./YOUR_LOCAL_MOODLE_FOLDER/@

Now that you have a working clone of the repository in your working area, you can execute one of the following directives:

Set up your workflow

• Execute the following commands:
  • git checkout master
  • git branch development
  • git push origin development
• This only needs to be done once. This will update the Github repository and all clones of your fork will now be able to pull these new branches from Github.

Work on a new feature

1. git checkout `git tag | grep "\-rc\$" | sort -r | head -1`
2. git checkout -b feature/<feature_name>
3. Repeat the following steps as necessary:
   • - change file(s) -
   • git commit -a -m "CCLE-#### - A useful short comment summarizing what you did."
4. git push origin <feature_name>
5. This should be done whenever there is a new RC tag available:
   • git merge `git tag | grep "\-rc\$" | sort -r | head -1`

Once the feature has passed code and administrative review

1. git checkout development
2. git merge --no-ff feature/<feature_name>
3. git push origin development

-Start- TEST machine ONLY

At this point, there could be more than one feature that is being tested!

1. git pull origin development

-End- On TEST machine ONLY

Once the feature(s) has been successfully tested and passed:

1. @git tag M.m.v.rr-rc @
   • M.m.v.rr-rc is [Moodle Major Version].[Moodle Minor Version].[Moodle Incremental Version].[Internal Version]-rc, where ‘rc’ stands for ‘release candiate’.
2. @git push origin M.m.v.rr-rc @
3. @git checkout master @
4. @git merge —no-ff M.m.v.rr-rc @
5. @git push origin master @

-Start- On STAGE machine ONLY

1. git pull origin master

-End- On STAGE machine ONLY

Once the feature(s) has been successfully test on STAGE and is ready for PROD:

1. git tag M.m.v.rr-gm
   • The numbers M.m.v.rr should be the same as the numbers for the RC tag.
2. git push origin M.m.v.rr-gm

-Start- On PROD machine ONLY

1. git fetch
2. git checkout `git tag | grep "\-gm\$" | sort -r | head -1`
3. Validate things are working…
4. Finished with release cycle!

-End- On PROD machine ONLY

Push a bug fix/hot fix

1. git checkout `git tag | grep "\-gm\$" | sort -r | head -1`
2. @git checkout b bugfix/CCLE#### @
3. Repeat until you have the bug fixed in your working instance:
   1. - change file(s) -
   2. git commit -a -m "CCLE-#### - Description of bug fix."
4. Once the bug has passed code and administrative review you can make a HF tag
   1. git tag M.m.v.rr-hf
   2. git push origin M.m.v.rr-hf
5. Push it to STAGE
   1. git checkout master
   2. @git merge —no-ff M.m.v.rr-hf @
   3. git push origin master
6. Update the STAGE machine
   1. git pull origin master
7. Once tested on STAGE, make a GM tag.
   1. git tag M.m.v.rr-gm
   2. git push origin M.m.v.rr-gm
8. Update the PROD machine
   1. git fetch
   2. git checkout `git tag | grep "\-gm\$" | sort -r | head -1`
9. Once a GM tag has been released, then we need to back-push our hot-fix into our development tract
   1. git checkout development
   2. @git merge —no-ff M.m.v.rr-hf @
   3. git push origin development
10. Each feature branch can merge the HF tag if desired.

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