Download to read offline
![[Public] gerrit concepts and workflows](https://cdn.slidesharecdn.com/ss_thumbnails/publicgerrit-conceptsandworkflows-200829034112-thumbnail.jpg?width=640&height=640&fit=bounds)
The-Git-Tutorial.ppt.pptx
- 1. Code Matters - EclipseHackers Git Guide EclipseCon 2014 http://eclipse.org/jgit http://eclipse.org/egit http://code.google.com/p/gerrit Stefan Lay (SAP) Lars Vogel (vogella) Christian Grail (SAP)
- 2. Gerrit Code Review@ Eclipse https://git.eclipse.org/r/ is activated for most projects
- 3. Case study: Contributingto Eclipse ● Create a user account https://dev.eclipse.org/site_login/createaccount .php ● Log into https://projects.eclipse.org/ and agree to the Contributor License agreement ● Logon to the Gerrit Web UI at https://git.eclipse.org/r/ using the email address you registered with your Eclipse (and Bugzilla) account and your Eclipse password. ● https://git.eclipse.org/r/#/settings/ and upload your public SSH key
- 4. Agenda Introduction Exercises Setup & Cloningthe Sample Repository Local Development with EGit Gerrit Code Review Contribution to Eclipse Q & A
- 5. Git Version Control Distributed Created 2005for Linux Kernel development Enables collaborative Workflows
- 6. Git at Eclipse 20102011 2012 2014 EGit and JGit projects used Git and Gerrit Projects could move to git Gerrit available for all projects CVS support ended 2013
- 7. Development with Git andEclipse
- 8. Developer PC Gerrit git git git git DeveloperPC git git clone repository
- 9.
- 10. Git Exercises 1 Setup& Clone the example repository 2 Develop a feature 3 Work on branches in parallel 4 Fetch the latest state Copyright © S. Lay, M. Sohn
- 11. Git in anutshell
- 12.
- 13.
- 14.
- 15.
- 16.
- 17.
- 18. Git Exercises 5 Merging,Rebasing, Resolving Conflicts 6 History view 7 Change a series of commits 8 Git blame
- 19.
- 20. Originally developed by Googlefor code review of the Android OS project
- 21. Gerrit Code Review@ Eclipse https://git.eclipse.org/r/ is activated for most projects
- 22. Contributions in Git Ifix Eclipse
- 23. Integration repository Contributor 1 Fetch/ Push Git Fetch Contributionsin Git I fix Eclipse
- 24. Fetch/ Push Reviews Contributions either viapatches or commit rights I don't know this guy, he does not get commit rights. Committer
- 25. Fetch/ Push Reviews Reviewing patches To much work… especiallyif there is a feedback loop Committer
- 26. Rule #1 ofgood code review - Make it easy! Reviews must be easy Contributions must be easy
- 27. Roles in aGerrit project ● Contributor ● Reviewer ● Committer ● Admin
- 28. Review feedback ● -2Blocks (committer only) ● -1 Please adjust ● 1 OK ● 2 Good to go (commiter only)
- 29. Integration repository Contributor 1 Contributor 2 Reviewer Fetch/ Push Fetch Fetch/Push CI Build Server Fetch Gerrit Reviews Fetch Fetch Approve +1 Suggestion to improve -1
- 30.
- 31. Advantages of Gerrit codereview ● “Safe” to contribute ● Easy for all sides ● Feedback possible on a line-by-line basis ● Great learning environment
- 32. One Commit ==one Gerrit review Gerrit review is identified via the Change-ID in the commit message Amend the commit and push the changes to update the review
- 33.
- 34. Comparison to Github ●Merge requests based on branches ● Feels easier than reviews based on commits ● But: Github review system not as advanced as with Gerrit
- 35.
- 36. Git Concepts: Pushingto Gerrit
- 37.
- 38.
- 39. Gerrit Discussing & Improving Copyright© S. Lay, M. Sohn
- 40.
- 41. Gerrit Learn more: Talk byShawn Pearce (Gerrit founder and Project Lead) and Ian Bull Extending Gerrit: A Look at the Gerrit Plugin API Tuesday, 10:30 to 11:05, Bayside
- 42. Gerrit Exercises 1 Configurepush to Gerrit 2 Push change to Gerrit 3 Review change 4 Improve a change 5 Submit a change to the codebase 6 New Changescreen 7 View Gerrit review notes
- 43. Common ancestor Commit 3 origin/master Gerrit issue#1 – non fast forward change Commit 4 Gerrit review 2 Gerrit review 3 Commit 2 Commit A Commit B
- 44. origin/master Solution issue #1– Rebase Commit 4 Gerrit review 2 Gerrit review 3 Commit A Commit B More...
- 45. Commit 1 Commit2 Commit 3 origin/master Gerrit issue #2 – Push a series of unrelated changes Commit 4 Gerrit review 1 Gerrit review 2 Gerrit review 3
- 46. Commit 1 Commit2 Commit 3 origin/master Gerrit issue #2 – Push a series of unrelated changes Commit 4 NO WAY THIS GETS INTO OUR CODE BASE!!! Gerrit review 2 Gerrit review 3
- 47. Commit 1 Commit 2 Commit3' origin/master Gerrit issue #2 – Solution Commit 4' git reset --hard origin/master git cherrypick 4 Push again to Gerrit → new change set Gerrit review 2 Gerrit review 3
- 48. Commit 1 Commit2 origin/master Gerrit issue #3 – Using the same Change-ID in two commits Commit 3 Change-ID I123 Change-ID I123 Change-ID I123
- 49. Commit 1 Commit2 origin/master Gerrit issue #3 – Solution: Squash commits Commit 3 Squash commits Push again to Gerrit → new change set Change-ID I123 Change-ID I123 Change-ID I123 Commit 2' Change-ID I123 Changes from 2 and 3
- 50. Gerrit Code Review@ Eclipse https://git.eclipse.org/r/ is activated for most projects
- 51. Case study: Contributingto Eclipse ● Create a user account https://dev.eclipse.org/site_login/createaccount .php ● Log into https://projects.eclipse.org/ and agree to the Contributor License agreement ● Logon to the Gerrit Web UI at https://git.eclipse.org/r/ using the email address you registered with your Eclipse (and Bugzilla) account and your Eclipse password. ● https://git.eclipse.org/r/#/settings/ and upload your public SSH key
- 52.
- 53. Join us atthe EclipseCon Hackathon and learn how to hack on JGit / EGit Harbour - Tuesday, March 18, 2014 - 19:00 to 21:00
- 54. Evaluate This Session Sign-in: www.eclipsecon.org Selectsession from schedule Evaluate : 1 2 3