This session was presented at MacTech 2014 in Los Angeles, California. Session description follows: Git and GitHub have changed the way we can collaborate with others on code-based projects, but it can be intimidating at first. How does this all work? We will cover the basics of Git and how to escape some of its pitfalls, and we will review some of the tools and processes available to those wanting to start or contribute to an open-source project, which isn't Git-specific. Writing code is only part of it!

1. How Do I Contribute?
Tim Sutton
Concordia University, Montreal

2. IT Operations

3. IT Operations
Development

4. Source Control Management
(SCM)

5. Git

6. Git Mercurial

7. commit 922ae4e4d558cf5c47e8a815abf2f6fe7c25a409
Author: Graham Gilbert <graham@grahamgilbert.com>
Date: Mon Sep 1 15:03:34 2014 +0100
Symlink for backwards compatibility
diff --git a/Dockerfile b/Dockerfile
index ee3529b..0f64d91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,6 +57,7 @@ CMD ["/run.sh"]
EXPOSE 8000
VOLUME ["$APP_DIR/plugins", "$APP_DIR/sal/settings.py"]
+RUN mkdir -p /home/app
+RUN ln -s $APP_DIR /home/app/sal
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

8. commit 071822982716877cf37634df6b0ec5cb3754545d
Author: Timothy Sutton <tim@synthist.net>
Date: Fri Oct 24 14:59:57 2014 -0400
Install Mavericks: bump to 10.9.5
diff --git a/Workflows/559B48FA-A325-4E9C-A7D2-9AE0CCCD8195.plist b/Workflows/559B48FA-
index c656813..bef4c33 100755
--- a/Workflows/559B48FA-A325-4E9C-A7D2-9AE0CCCD8195.plist
+++ b/Workflows/559B48FA-A325-4E9C-A7D2-9AE0CCCD8195.plist
@@ -17,7 +17,7 @@
<key>ignoreinstallfailure</key>
<string>NO</string>
<key>package</key>
- <string>InstallOSX_10.9.4_13E28_custom_autobuild.pkg</string>
+ <string>InstallOSX_10.9.5_13F34_custom_autobuild.pkg</string>
<key>postponedinstall</key>
<string>NO</string>
<key>targetname</key>
@@ -31,6 +31,6 @@
</dict>
</dict>
<key>title</key>
-<string> Upgrade to OS X Mavericks (10.9.4)</string>
+<string> Upgrade to OS X Mavericks (10.9.5)</string>
</dict>
</plist>

9. Good housekeeping

10. Know where you are

12. Resources
2nd edition released mid-October
http://git-scm.com/book
https://github.com/progit/progit2

13. Resources
http://stackoverflow.com/questions/tagged/git?sort=votes

14. Resources
https://try.github.io
http://onlywei.github.io/
explain-git-with-d3

15. Resources
https://try.github.io
http://onlywei.github.io/
explain-git-with-d3

16. GUI
SourceTree
GitHub for MacGitX-dev
Tower

17. http://git-scm.com/download/gui/mac
SourceTree
GitHub for MacGitX-dev
Tower

23. Practice, practice

24. GitHub

25. GitHub

26. GitHub

27. GitHub

29. Contributor Maintainer

30. Contributor Maintainer

31. Submitting changes
$

32. Submitting changes
$

33. Submitting changes
$ git clone https://github.com/timsutton/munki-conditions

34. Submitting changes
$
Cloning into 'munki-conditions'...
remote: Counting objects: 28, done.
remote: Total 28 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (28/28), done.
Checking connectivity... done.
git clone https://github.com/timsutton/munki-conditions

35. $
Submitting changes

36. $
git:(master) >$
cd munki-conditions
Submitting changes

37. $
git:(master) >$
cd munki-conditions
Submitting changes
cp /new/munki/condition/virtual .

38. $
git:(master) >$
git:(master) ✗ >$
cd munki-conditions
Submitting changes
cp /new/munki/condition/virtual .

39. $
git:(master) >$
git:(master) ✗ >$ git status
cd munki-conditions
Submitting changes
cp /new/munki/condition/virtual .

40. $
git:(master) >$
git:(master) ✗ >$
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
virtual
nothing added to commit but untracked files present (use "git add" to
track)
git status
cd munki-conditions
Submitting changes
cp /new/munki/condition/virtual .

41. git:(master) ✗ >$
Submitting changes

42. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$
Submitting changes

43. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$ git checkout add-virtual
Switched to branch 'add-virtual'
git:(add-virtual) ✗ >$
Submitting changes

44. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$ git checkout add-virtual
Switched to branch 'add-virtual'
git:(add-virtual) ✗ >$ git add virtual
git:(add-virtual) ✗ >$
Submitting changes

45. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$ git checkout add-virtual
Switched to branch 'add-virtual'
git:(add-virtual) ✗ >$ git add virtual
git:(add-virtual) ✗ >$ git status
Submitting changes

46. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$ git checkout add-virtual
Switched to branch 'add-virtual'
git:(add-virtual) ✗ >$ git add virtual
git:(add-virtual) ✗ >$ git status
On branch add-virtual
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: virtual
git:(add-virtual) ✗ >$
Submitting changes

47. git:(master) ✗ >$ git branch add-virtual
git:(master) ✗ >$ git checkout add-virtual
Switched to branch 'add-virtual'
git:(add-virtual) ✗ >$ git add virtual
git:(add-virtual) ✗ >$ git status
On branch add-virtual
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: virtual
git:(add-virtual) ✗ >$ git commit
Submitting changes

48. # Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch add-virtual
# Changes to be committed:
# new file: virtual
#
Submitting changes

49. # Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch add-virtual
# Changes to be committed:
# new file: virtual
#
Adding new ‘virtual’ condition
Submitting changes

50. # Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch add-virtual
# Changes to be committed:
# new file: virtual
#
Adding new ‘virtual’ condition
- returns ‘physical’ on a physical Mac, ‘vmware’ on Fusion
Submitting changes

51. # Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch add-virtual
# Changes to be committed:
# new file: virtual
#
Adding new ‘virtual’ condition
- returns ‘physical’ on a physical Mac, ‘vmware’ on Fusion
:wq
Submitting changes

52. [add-virtual c633790] Adding new 'virtual' condition
1 file changed, 20 insertions(+)
create mode 100755 virtual
Submitting changes

53. [add-virtual c633790] Adding new 'virtual' condition
1 file changed, 20 insertions(+)
create mode 100755 virtual
git:(add-virtual) >$
Submitting changes

54. [add-virtual c633790] Adding new 'virtual' condition
1 file changed, 20 insertions(+)
create mode 100755 virtual
git:(add-virtual) >$ git status
On branch add-virtual
nothing to commit, working directory clean
Submitting changes

55. Submitting changes

56. Submitting changes

57. git:(add-virtual) >$
Submitting changes

58. git:(add-virtual) >$ git remote add mactech
https://github.com/mactech2014/munki-conditions
git:(add-virtual) >$
Submitting changes

59. git:(add-virtual) >$ git remote add mactech
https://github.com/mactech2014/munki-conditions
git:(add-virtual) >$ git push mactech add-virtual
Counting objects: 3, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 716 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
To https://github.com/mactech2014/munki-conditions
* [new branch] add-virtual -> add-virtual
Submitting changes

60. Submitting changes

61. Submitting changes

62. Submitting changes

63. Submitting changes

64. Pulling in changes
git:(master) >$

65. Pulling in changes
git:(master) >$

66. Pulling in changes
git:(master) >$ git remote add mactech
https://github.com/mactech2014/munki-conditions
git:(master) >$

67. Pulling in changes
git:(master) >$ git remote add mactech
https://github.com/mactech2014/munki-conditions
git:(master) >$ git fetch mactech
From https://github.com/mactech2014/munki-conditions
* [new branch] add-virtual -> mactech/add-virtual
* [new branch] master -> mactech/master

68. Pulling in changes
git:(master) >$

69. Pulling in changes
git:(master) >$ git log mactech/add-virtual
commit c633790b8405d30d2681ae6b912cf7d89dcad5bc
Author: MacTech 2014 <2014@mactech.com>
Date: Thu Oct 23 14:50:08 2014 -0400
Adding new 'virtual' condition
- returns 'physical' on a physical Mac, 'vmware' on Fusion

70. commit c633790b8405d30d2681ae6b912cf7d89dcad5bc
Author: MacTech 2014 <2014@mactech.com>
Date: Thu Oct 23 14:50:08 2014 -0400
Adding new 'virtual' condition
- returns 'physical' on a physical Mac, 'vmware' on Fusion
diff --git a/virtual b/virtual
new file mode 100755
index 0000000..7697495
--- /dev/null
+++ b/virtual
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
Pulling in changes
git:(master) >$ git log --patch mactech/add-virtual

71. index 0000000..7697495
--- /dev/null
+++ b/virtual
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# writes a condition: 'virtual', which can be:
+# - 'physical' if a physical machine
+# - 'vmware' if a VMware VM
+#
+# Designed to be analogous to the 'virtual' Facter fact. No
+# other virtualization platforms are supported currently.
+
+DEFAULTS=/usr/bin/defaults
+MUNKI_DIR=$("${DEFAULTS}" read /Library/Preferences/ManagedInstalls
ManagedInstallDir)
+COND_DOMAIN="${MUNKI_DIR}/ConditionalItems"
+KEY="virtual"
+
+VALUE="physical"
+if system_profiler SPHardwareDataType | grep Boot ROM | grep VMW; then
+ VALUE="vmware"
+fi
+
+"${DEFAULTS}" write "${COND_DOMAIN}" "${KEY}" "${VALUE}"
Pulling in changes

72. Pulling in changes
git:(master) >$

73. Pulling in changes
git:(master) >$ git merge mactech/add-virtual
Updating 34c2366..c633790
Fast-forward
virtual | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100755 virtual
git:(master) >$

74. Pulling in changes
git:(master) >$ git merge mactech/add-virtual
Updating 34c2366..c633790
Fast-forward
virtual | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100755 virtual
git:(master) >$ git log -1
commit c633790b8405d30d2681ae6b912cf7d89dcad5bc
Author: MacTech 2014 <2014@mactech.com>
Date: Thu Oct 23 14:50:08 2014 -0400
Adding new 'virtual' condition
- returns ‘physical’ on a physical Mac, ‘vmware’ on Fusion

75. Pulling in changes

76. Pulling in changes
git:(master) >$

77. Pulling in changes
git:(master) >$ git push
Counting objects: 3, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 716 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
To https://github.com/timsutton/munki-conditions
34c2366..c633790 master -> master
git:(master) >$

78. Pulling in changes

79. Pulling in changes

80. Guidelines, ProTips

81. Just do it
CC BY 2.0
chan yiu hao
https://flic.kr/p/kiHuDG

82. Topic branches

83. Topic branches

84. Topic branches
http://stackoverflow.com/questions/
1628563/move-the-most-recent-
commits-to-a-new-branch-with-git

85. Follow coding style

86. git status
git diff --staged
git diff --check

90. Referencing code on GitHub

91. Referencing code on GitHub

92. Referencing code on GitHub
https://help.github.com/articles/writing-on-github/
https://help.github.com/articles/github-flavored-markdown/

93. https://github.com/autopkg/recipes/blob/mozilla-cdn-s3/
Mozilla/MozillaURLProvider.py
Referencing code on GitHub

94. https://github.com/autopkg/recipes/blob/mozilla-cdn-s3/
Mozilla/MozillaURLProvider.py#L93-L96
Referencing code on GitHub

95. https://github.com/autopkg/recipes/blob/mozilla-cdn-s3/
Mozilla/MozillaURLProvider.py#L93-L96
Referencing code on GitHub

96. https://github.com/autopkg/recipes/blob/
2a9594fcc660b812cd917e5c85698585eed04fed/Mozilla/
MozillaURLProvider.py#L93-L96
Referencing code on GitHub

97. One-time pull
git pull <url> <branch>

98. One-time pull
git pull
https://github.com/newspaperclub/osx-vm-templates
easier-renaming-of-vagrant-user

99. Checking out pull requests
$

100. Checking out pull requests
$
$ git config --add remote.origin.fetch
'+refs/pull/*/head:refs/remotes/origin/pr/*'

101. Checking out pull requests
$ git pull
$ git config --add remote.origin.fetch
'+refs/pull/*/head:refs/remotes/origin/pr/*'

102. Checking out pull requests
remote: Counting objects: 36, done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 36 (delta 15), reused 19 (delta 9)
Unpacking objects: 100% (36/36), done.
From https://github.com/timsutton/osx-vm-templates
* [new ref] refs/pull/1/head -> origin/pr/1
* [new ref] refs/pull/16/head -> origin/pr/16
* [new ref] refs/pull/2/head -> origin/pr/2
* [new ref] refs/pull/3/head -> origin/pr/3
* [new ref] refs/pull/4/head -> origin/pr/4
* [new ref] refs/pull/6/head -> origin/pr/6
* [new ref] refs/pull/8/head -> origin/pr/8
$ git pull
$ git config --add remote.origin.fetch
'+refs/pull/*/head:refs/remotes/origin/pr/*'
$

103. Checking out pull requests
remote: Counting objects: 36, done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 36 (delta 15), reused 19 (delta 9)
Unpacking objects: 100% (36/36), done.
From https://github.com/timsutton/osx-vm-templates
* [new ref] refs/pull/1/head -> origin/pr/1
* [new ref] refs/pull/16/head -> origin/pr/16
* [new ref] refs/pull/2/head -> origin/pr/2
* [new ref] refs/pull/3/head -> origin/pr/3
* [new ref] refs/pull/4/head -> origin/pr/4
* [new ref] refs/pull/6/head -> origin/pr/6
* [new ref] refs/pull/8/head -> origin/pr/8
$ git pull
$ git config --add remote.origin.fetch
'+refs/pull/*/head:refs/remotes/origin/pr/*'
$ git checkout origin/pr/16
Note: checking out 'origin/pr/16'.

104. https://help.github.com/articles/checking-out-pull-
requests-locally
http://git-scm.com/book/en/v2/GitHub-Maintaining-a-
Project#Managing-Pull-Requests
http://nedbatchelder.com/blog/201407/
fetching_github_pull_requests.html
Checking out pull requests

105. TextMate mode (press ’t’)
Always make a topic branch
Keep commits logical

106. TextMate mode (press ’t’)
Always make a topic branch
Keep commits logical

107. Shell integration
https://github.com/jimeh/git-aware-prompt

108. Shell integration
https://github.com/jimeh/git-aware-prompt
Oh-My-ZSH (default robbyrussel theme)
http://ohmyz.sh

109. macops.ca/mactech-2014