Effective Git - EclipseCon 2011 tutorial

Effective Git Tutorial EclipseCon 2011 http://eclipse.org/egit http://code.google.com/p/ gerrit Matthias Sohn (SAP) + = Stefan Lay (SAP) Chris Aniszczyk(Redhat) Shawn Pearce (Google)

Git ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Git at Eclipse ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Modern Code Review – What is it ? ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Guido van Rossum [1] [1] http://code.google.com/p/rietveld/downloads/detail?name=Mondrian2006.pdf Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Code Review – Benefits ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Guido van Rossum [1] [1] http://code.google.com/p/rietveld/downloads/detail?name =Mondrian2006.pdf Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Developer PC Gerrit git git git git Developer PC git git Hudson - clone repository - fetch / push changes - verify proposed changes - continuous integration builds Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Developer PC git git Gerrit git git git git push improved change 10 Developer PC git git fetch change 23 to try it master change 12 change 10 change 23 submit accepted change 12 fetch master to get updates Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Git Concepts – config files ,[object Object],[object Object],[object Object],[object Object],System <gitinst>/etc/gitconfig Global ~/.gitconfig Repository Specific .git/config Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Making Changes ,[object Object],[object Object],[object Object],[object Object],Calculator .git <working tree> git checkout master Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Committing Changes ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Clone Remote Repository ,[object Object],[object Object],[object Object],A B C master D E F HEAD feature-1 A B C master D E F HEAD origin/feature-1 origin/master Remote “origin” Local clone clone Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Clone Remote Repository ,[object Object],[object Object],[object Object],A B C master D E F HEAD origin/feature-1 origin/master Local clone Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Remote Tracking Branches ,[object Object],[object Object],[object Object],A B C master D E F HEAD origin/feature-1 origin/master Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Fetch ,[object Object],A B C master D E F HEAD feature-1 Remote “origin” G feature-1 A B C master D E F HEAD origin/feature-1 origin/master Local clone G origin/feature-1 fetch Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Merge ,[object Object],[object Object],A B C D E F HEAD feature-1 A B C 1.0 D E F HEAD feature-1 G 1 2 1 2 1.0 merge feature-1 Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Cherry Pick ,[object Object],[object Object],[object Object],A B C 1.0 D E F HEAD feature-1 1 2 A B C 1.0 D E F HEAD feature-1 G 2 cherry-pick F Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Rebase ,[object Object],[object Object],[object Object],A B C 1.0 D E F HEAD feature-1 A B C 1.0 D E ’ F ’ HEAD feature-1 1 2 1 2 rebase 1.0 Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD A B C master Remote “origin” repo push Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD D A B C master D Remote “origin” repo push Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD A B D master Remote “origin” repo D E C E push Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],[object Object],A B origin/master Local repo feature-1 HEAD D C ’ A B D master Remote “origin” repo C ’ push Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],A B origin/master C Local repo feature-1 HEAD A B C master Gerrit hosted “origin” repo refs/changes/63/363/1 Gerrit DB - Open Changes: … {Change-ID = 1234, Patch-Set-1 = refs/changes/63/363/1 } … Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push ,[object Object],[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD D A B C master Gerrit hosted “origin” repo refs/changes/63/363/1, Change 1234 D refs/changes/64/364/1, Change 1235 depends on Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

New Change vs New Patch Set ,[object Object],Make lib.Repository abstract and lib.FileRepository its implementation To support other storage models other than just the local filesystem, … will rename it into storage.file.FileRepository, but to do that we need to also move a number of other related class, which we aren't quite ready to do. Change-Id: I1bd54ea0500337799a8e792874c272eb14d555f7 Signed-off-by: Joe Developer <joe@example.org> Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push New Patchset ,[object Object],[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD D Change 1234, Patch Set 1 Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push New Patchset ,[object Object],[object Object],[object Object],A B origin/master C Local repo feature-1 HEAD Change 1234, Patch Set 1 A B origin/master C Local repo feature-1 HEAD D Change 1234, Patch Set 1 Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push New Patchset ,[object Object],[object Object],[object Object],A B Local repo HEAD A B C Local repo Change 1234, Patchset 1 master D HEAD master Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Push New Patchset ,[object Object],[object Object],[object Object],A B C Local repo Change 1234, Patch Set 1 D HEAD feature-1 A B C Local repo Change 1234, Patch Set 1 HEAD feature-1 Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Best Practices ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],Copyright © M. Sohn, S. Lay, S. Zivkov, C. Halstrick, C. Aniszczyk, S. Pearce

Effective Git - EclipseCon 2011 tutorial

Recomendados

Recomendados

Más contenido relacionado

Destacado

Destacado (6)

Similar a Effective Git - EclipseCon 2011 tutorial

Similar a Effective Git - EclipseCon 2011 tutorial (20)

Más de msohn

Más de msohn (20)

Effective Git - EclipseCon 2011 tutorial