{"id":10,"date":"2009-08-10T07:48:39","date_gmt":"2009-08-10T11:48:39","guid":{"rendered":"http:\/\/galencharlton.com\/blog\/?p=10"},"modified":"2009-08-10T07:48:39","modified_gmt":"2009-08-10T11:48:39","slug":"koha-git-mini-tutorial-pulling-from-remote-repostories","status":"publish","type":"post","link":"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/","title":{"rendered":"Koha Git mini-tutorial: pulling from remote repostories"},"content":{"rendered":"<p>Earlier today Chris Cormack and I were chatting on IRC about various ways to manage patches, and decided to stage a little <a href=\"http:\/\/wiki.koha.org\/doku.php?id=en:documentation:tutorials\">tutorial<\/a> about how to pull from remote Git repositories:<\/p>\n<blockquote>\n<style type=\"text\/css\">\nspan.ircnickchris {\n  color: green;\n}\nspan.ircnickgmcharlt {\n  color: blue;\n}\n<\/style>\n<p><span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">speaking of public repo&#8217;s &#8230; i have been pushing to github for a while<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">but i have set up git-daemon on my machine at home too<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">chris: anything you&#8217;re ready to have me look at to pull?<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">not really<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">one interesting thing is the dbix_class branch<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">http:\/\/git.workbuffer.org\/cgi-bin\/gitweb.cgi?p=koha.git;a=summary<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">even if it&#8217;s trivial, it occurs to me that doing it and writing up how we did it might be useful material for a tutorial blog post or maiilings to koha-devel<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">lemme check<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">tell ya what<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">ill do a history.txt update<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">and commit that, and we can pull that<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">gmcharlt: http:\/\/git.workbuffer.org\/cgi-bin\/gitweb.cgi?p=koha.git;a=shortlog;h=refs\/heads\/documentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">so you can a remote for my repo<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">git remote add workbuffer.org git:\/\/git.workbuffer.org\/git\/koha.git<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">then git checkout -b documentation &#8211;track workbuffer.org\/documentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">(probably need a git fetch workbuffer.org too(<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">then you can cherry-pick that commit over<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">thats one way to do it<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">or you could just checkout a branch<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">chris: yeah, I think I&#8217;ll do it as a pull<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">checkout -b mydocumentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">git pull workbuffer.org\/documentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">i think that will do it anyway<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">yeah, then into my staging branch<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">git checkout test<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">git merge mydocumentation\/documentation<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">or directly<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">git merge workbuffer.org\/documentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">yep<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">i think the pull will do fetch + merge for ya<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">it does indeed<\/span><br \/>\n<span class=\"ircnickchris\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">fetch first, though<\/span><br \/>\n<span class=\"ircnickchris\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">lets you do git log &#8211;pretty=oneline test workbuffer.org\/documentation<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">good point<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">chris: well, let&#8217;s make it official &#8211; send a pull request to the patches list<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">will do<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">e.g., Subject: PULL &#8211; git:\/\/git.workbuffer.org\/koha.git &#8211; documentation &#8211; history changes<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">brief description of changes in body<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">something like that<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">works for me<\/span><br \/>\n<span class=\"ircnickgmcharlt\">&lt;gmcharlt&gt;<\/span> <span class=\"irctext\">&#8220;Welcome, all, to DVCS performance theatre&#8221;<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">off it goes<\/span><br \/>\n<span class=\"ircnickchris\">&lt;chris&gt;<\/span> <span class=\"irctext\">this was our first git tutorial right there .. quick someone take photos or something \ud83d\ude42<\/span>\n<\/p><\/blockquote>\n<div class=\"sharedaddy sd-sharing-enabled\"><div class=\"robots-nocontent sd-block sd-social sd-social-icon-text sd-sharing\"><h3 class=\"sd-title\">Share this:<\/h3><div class=\"sd-content\"><ul><li class=\"share-twitter\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"sharing-twitter-10\" class=\"share-twitter sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=twitter\" target=\"_blank\" title=\"Click to share on Twitter\"><span>Twitter<\/span><\/a><\/li><li><a href=\"#\" class=\"sharing-anchor sd-button share-more\"><span>More<\/span><\/a><\/li><li class=\"share-end\"><\/li><\/ul><div class=\"sharing-hidden\"><div class=\"inner\" style=\"display: none;\"><ul><li class=\"share-tumblr\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-tumblr sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=tumblr\" target=\"_blank\" title=\"Click to share on Tumblr\"><span>Tumblr<\/span><\/a><\/li><li class=\"share-reddit\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-reddit sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=reddit\" target=\"_blank\" title=\"Click to share on Reddit\"><span>Reddit<\/span><\/a><\/li><li class=\"share-end\"><\/li><li class=\"share-print\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-print sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/\" target=\"_blank\" title=\"Click to print\"><span>Print<\/span><\/a><\/li><li class=\"share-end\"><\/li><\/ul><\/div><\/div><\/div><\/div><\/div>","protected":false},"excerpt":{"rendered":"<p>Earlier today Chris Cormack and I were chatting on IRC about various ways to manage patches, and decided to stage a little tutorial about how&#8230;<\/p>\n<div class=\"sharedaddy sd-sharing-enabled\"><div class=\"robots-nocontent sd-block sd-social sd-social-icon-text sd-sharing\"><h3 class=\"sd-title\">Share this:<\/h3><div class=\"sd-content\"><ul><li class=\"share-twitter\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"sharing-twitter-10\" class=\"share-twitter sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=twitter\" target=\"_blank\" title=\"Click to share on Twitter\"><span>Twitter<\/span><\/a><\/li><li><a href=\"#\" class=\"sharing-anchor sd-button share-more\"><span>More<\/span><\/a><\/li><li class=\"share-end\"><\/li><\/ul><div class=\"sharing-hidden\"><div class=\"inner\" style=\"display: none;\"><ul><li class=\"share-tumblr\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-tumblr sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=tumblr\" target=\"_blank\" title=\"Click to share on Tumblr\"><span>Tumblr<\/span><\/a><\/li><li class=\"share-reddit\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-reddit sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/?share=reddit\" target=\"_blank\" title=\"Click to share on Reddit\"><span>Reddit<\/span><\/a><\/li><li class=\"share-end\"><\/li><li class=\"share-print\"><a rel=\"nofollow noopener noreferrer\" data-shared=\"\" class=\"share-print sd-button share-icon\" href=\"https:\/\/galencharlton.com\/blog\/2009\/08\/koha-git-mini-tutorial-pulling-from-remote-repostories\/\" target=\"_blank\" title=\"Click to print\"><span>Print<\/span><\/a><\/li><li class=\"share-end\"><\/li><\/ul><\/div><\/div><\/div><\/div><\/div>","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"spay_email":"","jetpack_publicize_message":"","jetpack_is_tweetstorm":false},"categories":[10],"tags":[12,65,66],"jetpack_featured_media_url":"","jetpack_publicize_connections":[],"jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p3gJ9y-a","_links":{"self":[{"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/posts\/10"}],"collection":[{"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/comments?post=10"}],"version-history":[{"count":8,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/posts\/10\/revisions"}],"predecessor-version":[{"id":18,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/posts\/10\/revisions\/18"}],"wp:attachment":[{"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/media?parent=10"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/categories?post=10"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/galencharlton.com\/blog\/wp-json\/wp\/v2\/tags?post=10"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}