+ = awesome Ryan McCue @rmccue

three sections

1) git basics 2) efficient git 3) git + WordPress

1) git basics 2) efficient git 3) git + WordPress + WordPress community summit

command line?

No content

No content

I am going to lie to you Warning:

this might hurt your head Warning:

this might hurt your head Warning: let me know!

1) git basics 2) efficient git 3) git + WordPress

what is git?

git manages history

git manages history your files

your files my-theme/ index.php style.css

your files my-theme/ index.php style.css style.css.old

your files my-theme/ index.php style.css style.css.old style.css.bak style.css.bak.bak style.css.whatdidido style.css.help style.css.helphelp.help style.css.nooooo

git!

your files my-theme/ index.php style.css

“working directory”

$ git init

working my-theme/ index.php style.css committed my-theme/

working my-theme/ index.php style.css committed my-theme/ ?

$ git commit -a

$ git commit -a I’ll come back to this

working my-theme/ index.php style.css committed my-theme/ index.php style.css commit -a

working my-theme/ index.php style.css committed my-theme/ index.php style.css commit -a ?

$ git checkout

working my-theme/ index.php style.css committed my-theme/ index.php style.css commit -a checkout

edit part of the theme? what if I only

“staging area”

working committed staging my-theme/ my-theme/ my-theme/ index.php style.css ? ?

$ git add

$ git checkout

working committed staging my-theme/ index.php style.css my-theme/ my-theme/ index.php style.css add checkout

working committed staging my-theme/ index.php style.css my-theme/ my-theme/ index.php style.css add checkout ? ?

$ git commit

$ git reset

working committed staging my-theme/ index.php style.css my-theme/ index.php style.css my-theme/ index.php style.css add checkout commit reset

working committed staging my-theme/ index.php style.css my-theme/ index.php style.css my-theme/ index.php style.css add checkout commit reset commit -a reset --hard

$ git commit -a

$ cd mytheme/ $ git init Initialized empty Git repository in …/mytheme/.git/ $ vim index.php $ vim style.css $ git add index.php $ git add style.css $ git commit –m ‘Initial commit’ [master (root-commit) e6d6f02] Initial commit 0 files changed, 200 insertions(+), 0 deletions(-) create mode 100644 index.php create mode 100644 style.css

$ vim style.css $ git add style.css $ git commit –m ‘Improve styling for links’ [master dda31a3] Improve styling for links 1 files changed, 20 insertions(+), 2 deletions(-)

sharing is caring

No content

your commits my-theme/ index.php style.css GitHub my-theme/ index.php style.css

your commits my-theme/ index.php style.css GitHub my-theme/ index.php style.css ? ?

$ git push -u origin master

$ git push -u origin master

$ git push -u origin master

$ git push

your commits my-theme/ index.php style.css GitHub my-theme/ index.php style.css push ?

$ git pull

your commits my-theme/ index.php style.css GitHub my-theme/ index.php style.css push pull

questions?

1) git basics 2) efficient git 3) git + WordPress

edit part of the theme? what if I only

edit part of the file? what if I only

$ git add -p

$ git add -p = awesome

$ git checkout -p add reset

$ vim style.css $ git add style.css $ git add -p

$ git add -p diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index ef8fb5f..f77c645 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -107,6 +107,10 @@ class WP_Upgrader { function download_package($package) { + $reply = apply_filters('upgrader_pre_download', false, $package, $this); + if ( false !== $reply ) + return $reply; + if ( ! preg_match('!^(http|https|ftp)://!i', $package) && file_exists($package) ) //Local file or remote? return $package; //must be a local file.. Stage this hunk [y,n,q,a,d,/,e,?]?

Stage this hunk [y,n,q,a,d,/,e,?]? ? y - stage this hunk n - do not stage this hunk q - quit; do not stage this hunk nor any of the remaining ones a - stage this hunk and all later hunks in the file d - do not stage this hunk nor any of the later hunks in the file g - select a hunk to go to / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk ? - print help

branches

groups of changes

master

master my-theme/ index.php style.css new-stuff my-theme/ index.php style.css

master my-theme/ index.php style.css new-stuff my-theme/ index.php style.css ? ?

$ git branch $ git checkout

$ git checkout –b

$ git merge

master my-theme/ index.php style.css new-stuff my-theme/ index.php style.css branch merge

master new-stuff git checkout -b new-stuff

master new-stuff

master new-stuff git merge master

master new-stuff

master new-stuff git checkout master git merge new-stuff

push/pull

master new-stuff

master new-stuff GitHub you

$ git clone

$ git clone [email protected]:example/example.git

GitHub you me

GitHub you me

GitHub you me

$ git push To [email protected]:example/example.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '[email protected]:example/example.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.

GitHub you me

$ git push -u origin master

$ git remote add origin [email protected]:example/example.git

pull requests

pull requests = awesome

No content

No content

No content

No content

internal use too!

tips & tricks

$ git log commit eee30254c2ba314ad7fe3bc493095af421118c27 Author: Ryan McCue Date: Fri Oct 26 00:01:26 2012 +1000 Check unknown status codes too commit 7ce9e116792697955ba32be9e18d67d37513f80b Author: Ryan McCue Date: Thu Oct 25 23:52:19 2012 +1000 Test new status headers These were previously added while in draft status, but not tested. This adds testing for those, in addition to updating the link to the new related RFC. commit 083843d9dbd4eeb0fc24fe35479d472f6bea4ff9 Merge: 3f508b0 23c2087 Author: Ryan McCue Date: Thu Oct 25 06:39:30 2012 -0700 Merge pull request #23 from rmccue/multiple Add ability to send multiple requests at once

$ git log --stat commit eee30254c2ba314ad7fe3bc493095af421118c27 Author: Ryan McCue Date: Fri Oct 26 00:01:26 2012 +1000 Check unknown status codes too tests/Transport/Base.php | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) commit 7ce9e116792697955ba32be9e18d67d37513f80b Author: Ryan McCue Date: Thu Oct 25 23:52:19 2012 +1000 Test new status headers These were previously added while in draft status, but not tested. This adds testing for those, in addition to updating the link to the new related RFC. library/Requests/Exception/HTTP/428.php | 4 ++-- library/Requests/Exception/HTTP/431.php | 4 ++-- library/Requests/Exception/HTTP/511.php | 4 ++-- tests/Transport/Base.php | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-)

$ git pull remote: Counting objects: 677, done. remote: Compressing objects: 100% (168/168), done. Receiving objects: remote: Total 583 (delta 489), reused 505 (delta 412) Receiving objects: 100% (583/583), 125.00 KiB | 107 KiB/s, done. Resolving deltas: 100% (489/489), completed with 85 local objects. From https://github.com/WordPress/WordPress c67a081..78f0c0a master -> origin/master Updating c67a081..78f0c0a Fast-forward wp-admin/admin-ajax.php | 2 +- wp-admin/css/colors-classic.min.css | 2 +- wp-admin/css/colors-fresh.min.css | 2 +- wp-admin/css/wp-admin-rtl.css | 18 +- wp-admin/css/wp-admin-rtl.min.css | 2 +- wp-admin/css/wp-admin.css | 35 +- wp-admin/css/wp-admin.min.css | 2 +- wp-admin/custom-background.php | 21 +- wp-admin/custom-header.php | 36 +-

$ git pull remote: Counting objects: 677, done. remote: Compressing objects: 100% (168/168), done. Receiving objects: remote: Total 583 (delta 489), reused 505 (delta 412) Receiving objects: 100% (583/583), 125.00 KiB | 107 KiB/s, done. Resolving deltas: 100% (489/489), completed with 85 local objects. From https://github.com/WordPress/WordPress c67a081..78f0c0a master -> origin/master Updating c67a081..78f0c0a Fast-forward wp-admin/admin-ajax.php | 2 +- wp-admin/css/colors-classic.min.css | 2 +- wp-admin/css/colors-fresh.min.css | 2 +- wp-admin/css/wp-admin-rtl.css | 18 +- wp-admin/css/wp-admin-rtl.min.css | 2 +- wp-admin/css/wp-admin.css | 35 +- wp-admin/css/wp-admin.min.css | 2 +- wp-admin/custom-background.php | 21 +- wp-admin/custom-header.php | 36 +-

$ git log c67a081..78f0c0a commit 78f0c0a9dffb01c8d369f860f189beb9210de6b9 Author: Andrew Nacin Date: Mon Nov 12 07:47:41 2012 +0000 Revert [22421]. see #6821. see #22308. see #22419. git-svn-id: http://core.svn.wordpress.org/trunk@22549 1a063a9b-81f0-0310-95a commit 1ec12cccb9d12fdbde7c6592266fb875555c39f3 Author: Daryl Koopersmith Date: Mon Nov 12 06:02:03 2012 +0000 Media: Allow successive embed URLs. see [22547], #21390. git-svn-id: http://core.svn.wordpress.org/trunk@22548 1a063a9b-81f0-0310-95a commit 2d87f983adfc75587f544ab742619b380d9a8cdb Author: Daryl Koopersmith Date: Mon Nov 12 05:57:12 2012 +0000

questions?

1) git basics 2) efficient git 3) git + WordPress

Skeleton github.com/markjaquith/WordPress-Skeleton

No content

submodules (like svn externals)

submodules ≠ awesome

submodules ≠ awesome try Tower?

keep it simple

site/ wp-admin/ wp-content/ wp-includes/ ...

$ git init Initialized empty Git repository in …/site/.git/ $ git add * $ git commit -m ‘Initial commit’ [master (root-commit) eadd213] Initial commit 2 files changed, 35 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 .gitmodules

site/wp-content/plugins/bbpress/

$ git add wp-content/plugins/bbpress/* $ git commit -m ‘Add bbPress’ [master 26b47c0] Add bbPress 200 files changed, 62840 insertions(+), 0 deletions(-) create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-actions.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-admin.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-converter.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-forums.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-functions.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-metaboxes.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-parser.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-replies.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-settings.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-tools.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-topics.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/bbp-users.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/converters/Example.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/converters/Invision.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/converters/bbPress1.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/converters/index.php create mode 100644 wp-content/plugins/bbpress/bbp-admin/converters/phpBB.php

$ git remote add origin [email protected]:rmccue/test-site.git $ git push -u origin master Counting objects: 1268, done. Writing objects: 91% (1154/1268), 4.16 MiB | 13 KiB/s Compressing objects: 100% (1248/1248), done. Writing objects: 100% (1268/1268), 4.90 MiB | 15 KiB/s, done. Total 1268 (delta 128), reused 0 (delta 0) To [email protected]:rmccue/test-site.git * [new branch] master -> master Branch master set up to track remote branch master from origin.

WP Australia github.com/BronsonQuick/wpaustralia

No content

Wrong

Wrong (sorry Bronson)

try it anyway!

I am going to lie to you Warning:

one last thing

No content

that’s it

questions? http://journal.ryanmccue.info/185 http://windows.github.com/ http://mac.github.com/ http://www.git-tower.com/ http://try.github.com/ http://github.com/markjaquith/WordPress-Skeleton http://github.com/BronsonQuick/wpaustralia Ryan McCue http://ryanmccue.info/ @rmccue