Git Init - Initialise your Git skills for Drupal

An introduction to Git with a Drupal slant. Covers basic Git commands and Drupal patches.

Presented at Dundee Drupal User Group meeting - Aug 2013

Transcript

1. git init Initialise Your Git Skills for Drupal
2. Topics Covered  What is Git?  Creating a Repository  Git Commands  Applying a Patch from Drupal.org  Creating a Patch for Drupal.org
3. What is Git?  Version Control System (VCS)  Track changes to a set of files over time  Many file types – txt, php, jpg etc  Developed by Linus Torvalds  Used by Drupal to manage core/contrib https://github.com/git/git
4. Git is Similar to Computer Games?
5. Saved Games
6. Git Commands
7. Creating a Repository I git init Initialises a new Git repository
8. Creating a Repository II git clone
9. Git Workflow Source: https://www.atlassian.com/git/tutorial/git-basics#!add
10. Adding Files to Staging Area git add git add <file> git add <directory> git add .
11. Saving State git commit git commit –m “Commit message”
12. What’s Goin’ on? git status List which files have been modified or are untracked
13. Viewing Commit History git log Displays committed snapshot history
14. status vs log Source: https://www.atlassian.com/git/tutorial/git-basics#!log
15. Check it Out git checkout git checkout <commit> git checkout <file> git checkout <branch>
16. Demo Source: http://www.redbubble.com/people/littleredplanet/works/6426341-show-me-the-code?p=sticker
17. What’s Changed? git diff Display all changes in the working directory Similar to git status
18. Patching Drupal What is a Patch?
19. Patch Anatomy Command used to create the file Affected Files Hunks of Changes
20. Patching Drupal Why Patch?  Fix a bug  Add functionality How to Patch?  Manually  With Git
21. Applying Drupal Patches - Manually  Manually add changes to the code files  Look for RTBC or confirmation from other Drupalers  Apply patch in dev first!
22. Demo – Manual Patch Feeds module – unique GUID https://drupal.org/node/1539224#comment-7394766 Image source: http://fourkitchens.com/blog/2011/08/22/apply-patch-clear-cache
23. Applying Drupal Patches – with Git  Instructions are on the project page  Clone project with Git  Download patch to module/theme directory  git apply -v [patchname.patch]
24. Demo – Patch with Git Waitlist message – entity registration module https://drupal.org/node/2018741#comment-7754431 Image source: http://fourkitchens.com/blog/2011/08/22/apply-patch-clear-cache
25. Creating Drupal Patches 1. Search issue queue first 2. Newest version of project where bug exists? 3. Clone code from drupal.org 4. Create the patch  Coding and security standards  Make changes  Test changes  Name patch: [issue_name]-[short-description]- [issue-number]-[comment-number].patch  Submit to issue queue
26. Demo – Creating a Patch  Instructions are on the project page
27. We created a patch!
28. Further Reading Git  http://git-scm.com/  http://gitref.org/  Install git - http://git-scm.com/book/en/Getting- Started-Installing-Git Drupal Patches  http://drupalladder.org/lesson/72a836e6-b408- a7a4-1923-8788761b2608  http://jacine.net/post/8419331209/patches  https://drupal.org/patch/submit