Distributed Developer Workflows using Git

Creating distributed development workflows using Git

Susan Potter

Champaign-Urbana Developer’s Meetup

August 8, 2011

Scope of Talk

• How does Git differ. . . ?CVS, Subversion, Perforce, Mercurial

• Gitting Started LocallyServer configuration management

• Centralized Remote(a.k.a. a better Subversion)

• Forking Workflows(the GitHub model)

• Gatekeeper Workflows(enterprise release management)

• Deployment Strategies?(scalable distributed deployment)

Scope of Talk

VCS Dimensions

Delta DAG

Local RCS cp -r or hard links

Centralized CVS, Subversion, Perforce ?

Distributed Mercurial, Darcs Git, Bazaar

Gitting Started Locally (1/4)

Initializing local repo inside working directory

• git init• git config user.email “user@domain”• git config user.name “Your Name”

Initializing local repo inside working directory• git init

• git config user.email “user@domain”• git config user.name “Your Name”

Initializing local repo inside working directory• git init• git config user.email “user@domain”

• git config user.name “Your Name”

Initializing local repo inside working directory• git init• git config user.email “user@domain”• git config user.name “Your Name”

$GIT_DIR => .git/

• branches• hooks• objects• refs• config & info

$GIT_DIR => .git/• branches

• hooks• objects• refs• config & info

$GIT_DIR => .git/• branches• hooks

• objects• refs• config & info

$GIT_DIR => .git/• branches• hooks• objects

• refs• config & info

$GIT_DIR => .git/• branches• hooks• objects• refs

• config & info

$GIT_DIR => .git/• branches• hooks• objects• refs• config & info

$GIT_INDEX => .git/index

• staging area• add files before commit• can even add “patches”

• staging area

• add files before commit• can even add “patches”

• staging area• add files before commit

• can even add “patches”

• staging area• add files before commit• can even add “patches”

D E M O

Centralized Workflow (1/3)

Adding a remote

• git init �bare

Create remote “bare” repo

• Setup server authN/authZ

e.g. $HOME/.ssh/authorized_keys, PAM, LDAP, etc.

• git remote add <name> <URL>

Add remote to local repository

Adding a remote• git init �bare

Sharing to remote

• git pull <remove> <branch>

Pull from <remote> <branch>

• git push <remote> <branch>

Push to <remote> <branch>

Sharing to remote• git pull <remove> <branch>

D E M O(with branching)

Forking Workflow (1/2)

Forking remote repository. . .

• cp -r <orig.repo> <forked.repo>

Basically just a straight copy is necessary

Forking remote repository. . .• cp -r <orig.repo> <forked.repo>

Basically just a straight copy is necessary

D E M O

Gatekeeper Workflow (1/2)

Gatekeeper remote repository. . .

• git init �bare

Basically just create a bare Git repo and let gatekeeper curate and selectively push

Gatekeeper remote repository. . .• git init �bare

Basically just create a bare Git repo and let gatekeeper curate and selectively push

D E M O

Deployment Workflows (1/2)

Distributed systems deployment could bundlerollback with new release. . .

• git bundle create <file.bundle>

<branches,tags,etc>

Creating a bundle with those branches, tags and/or commit range

• git bundle verify <file.bundle>

Verify bundle is valid and will apply cleanly to deployed repository

• git bundle unbundle <file.bundle>

Unbundling subset of repository on deployment node

Distributed systems deployment could bundlerollback with new release. . .• git bundle create <file.bundle>

<branches,tags,etc>

D E M O

Resources (1/2)

• http://git-scm.org• http://github.com• Pro Git by Scott Chacon

Questions?

Figure: http://www.flickr.com/photos/42682395@N04/

@SusanPotter

Questions?

Figure: http://www.flickr.com/photos/42682395@N04/

@SusanPotter

Distributed Developer Workflows using Git

Technology

Learning Git with Workflows

Git Ready! Workflows

Workflows and Requests, Rebasing Forking, Pulldogfalo.github.io › git-stuco › week6 › Week6.pdf · Git Workflows Many different ways to use git in a team There are general guidelines

Version Control, Part II - Git with a Shared Repository · Version Control, Part II - Git with a Shared Repository Hans-Martin von Gaudecker Collaboration ... workflows What Git has

Alfresco Developer Series: Advanced Workflowsecmarchitect.com/images/articles/alfresco-workflow/advanced... · Alfresco Developer Series Advanced Workflows 2nd Edition February,

Be a Happier Developer with Git / Productive Team #gettinggitright

Git and GitHub workflows

Linux® GIT Software Overview - NXP Semiconductors · Local Git Workflows (continued) •Undoing committed changes −Undoing the last commit $ git reset –hard HEAD^ Resets both

Using Git for Centralized and Distributed Version Control ... April 1 - Git... · Using Git for Centralized and Distributed Version Control Workflows - Day 3 1 April, 2016 Presenter:

Daily workflows with Git + GitHub + RStudio › ... › git-and-github-daily-workflows… · Daily workflows with Git + GitHub + RStudio. This work is licensed under a Creative Commons

Git & Git Workflows

Git workflows for IESP

Visualizing Git Workflows - scribestools.readthedocs.io · eScribis GestionDeProduits-GitWorkflows-6 1 Visualizing Git Workflows... r rw rw w pr fk fk Trees Commits Branches Repositories

Design Patterns for Git Workflows · 11 Managed by UT-Battelle for the U.S. Department of Energy Git Workflows for CSE Testing Issues/Support for Git Workflows Test Suites: • CI

Git workflows á la-carte, Presenation at jdays2013 by Nicola Paolucci

Git&GitHub @ Android Developer Days ADD 2013 / @burakaydn

Git Workflows

Essential Git For Developers - DrupalCon · 49 Essential Git For Developers Team Developer workflow (private) – Regularly commit code. 'git add {filename}' X each file 'git commit

Know the science behind workflows using Git GitHub

Git and github - Verson Control for the Modern Developer