Download as PDF, PPTX
![San Francisco, USA Git Commit to a local repository • it’s your repository, so you can commit anything, anytime • until published feel free to change history as needed $ git commit -a -m 'A useful commit message' [master (root-commit) 419aaa2] foo 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .userchain Freitag, 10. Juni 11](https://image.slidesharecdn.com/gitandgerrit-110610134314-phpapp01/75/How-Git-and-Gerrit-make-you-more-productive-7-2048.jpg)
Uploaded byKarsten Dambekalns
How Git and Gerrit make you more productive
The document presents a presentation by Karsten Dambekalns about the productivity benefits of using Git and Gerrit for version control and code reviews. It highlights Git's powerful features, such as local commits, history rewriting, and easy branching, while Gerrit's role as a web-based code review tool that manages permissions and facilitates quality assurance. The summary concludes that Git enhances efficiency and Gerrit streamlines the code review process, ultimately aiding in better functional testing and change management.
How Git and Gerrit make you more productive
- 1. San Francisco, USA KarstenDambekalns How Git and Gerrit make you more productive Freitag, 10. Juni 11
- 2. San Francisco, USA co-leadof TYPO3 5.0 and FLOW3 34 years old lives in Lübeck, Germany 1 wife, 3 sons, 1 espresso machine likes canoeing Karsten Dambekalns Freitag, 10. Juni 11
- 3. San Francisco, USA Git Gitis a distributed version control system • Freitag, 10. Juni 11
- 4. San Francisco, USA Git •originally developed by Linus Torvalds • is a distributed version control system • every working copy is a complete repository • very powerful • can seem more complex than Subversion • basic operations actually quite simple Freitag, 10. Juni 11
- 5. San Francisco, USA Git Clonea repository $ mkdir FLOW3 $ cd FLOW3 $ git clone --recursive git://git.typo3.org/FLOW3/Distributions/Base.git . Cloning into .... remote: Counting objects: 3837, done. remote: Compressing objects: 100% (2023/2023), done. remote: Total 3837 (delta 2007), reused 2721 (delta 1465) Receiving objects: 100% (3837/3837), 3.49 MiB | 28 KiB/s, done. Resolving deltas: 100% (2007/2007), done. Freitag, 10. Juni 11
- 6. San Francisco, USA Git Updatefrom a remote repository $ git submodule foreach "git checkout master" -✂-----✂-----✂-----✂-----✂-----✂-----✂-----✂-----✂-----✂-----✂-----✂- $ git submodule foreach "git pull --rebase" Entering 'Build/Common' First, rewinding head to replay your work on top of it... Fast-forwarded master to 6f27f1784240b414e966ce0e5a12e23cb2f7ab02. Entering 'Packages/Application/TYPO3' First, rewinding head to replay your work on top of it... Fast-forwarded master to 5187430ee44d579ae2bac825e2a069c4cd3f38a4. Entering 'Packages/Application/TYPO3CR' First, rewinding head to replay your work on top of it... Fast-forwarded master to b1f5331aa51d390fa3d973404f31b9fd773f7059. Entering 'Packages/Application/Twitter' Current branch master is up to date. … Freitag, 10. Juni 11
- 7. San Francisco, USA Git Committo a local repository • it’s your repository, so you can commit anything, anytime • until published feel free to change history as needed $ git commit -a -m 'A useful commit message' [master (root-commit) 419aaa2] foo 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .userchain Freitag, 10. Juni 11
- 8. San Francisco, USA Git Pushto a remote repository • after publishing do not change history anymore $ git push Counting objects: 82, done. Delta compression using up to 2 threads. Compressing objects: 100% (31/31), done. Writing objects: 100% (57/57), 6.09 KiB, done. Total 57 (delta 24), reused 21 (delta 7) To git@github.com:typo3/gerrit.git + 6cd4495...a2bcced production -> production Freitag, 10. Juni 11
- 9. San Francisco, USA Git Coolfeatures • local repository allows commits anytime • local history can be cleaned up before pushing changes • branches are local, fast and cheap • changes can be shared easily • distinguishes author and committer • powerful history rewriting Freitag, 10. Juni 11
- 10. San Francisco, USA CodeReviews Freitag, 10. Juni 11
- 11. San Francisco, USA CodeReviews • are a quality assurance tool • all code contains errors, more or less • it’s easier to spot them with four, six, eight, … eyes • a review must be passed for code to be integrated Freitag, 10. Juni 11
- 12. San Francisco, USA CodeReviews Code Review is about the looks • good variable and function names • CGL compliance • reasonable program flow • clean coding Can be checked by reading the code, can partly be automated Freitag, 10. Juni 11
- 13. San Francisco, USA CodeReviews Functional Review is about the functionality • do the unit and functional tests pass? • does the bugfix fix the bug? the feature work? • is nothing else broken? Can be checked by testing the code, can partly be automated Freitag, 10. Juni 11
- 14. San Francisco, USA Gerrit Gerritis a code review tool • developed by Google for Android • based on Git • acts as a firewall in front of a Git repository • is a web-based review tool • is a SSH server • is a Git server • manages Git permissions along the way • see it at https://review.typo3.org Freitag, 10. Juni 11
- 15. San Francisco, USA Gerrit Gitstandalone Git & Gerrit Freitag, 10. Juni 11
- 16. San Francisco, USA Gerrit Freitag,10. Juni 11
- 17. San Francisco, USA Gerrit seeuser’s changes unique change id filter by project Freitag, 10. Juni 11
- 18. San Francisco, USA Gerrit Freitag,10. Juni 11
- 19. San Francisco, USA Gerrit Freitag,10. Juni 11
- 20. San Francisco, USA Gerrit Freitag,10. Juni 11
- 21. San Francisco, USA Gerrit Communicationis Key • inline comments by double clicking in diff view • per patch set comments Freitag, 10. Juni 11
- 22. San Francisco, USA Gerrit FunctionalTests Made Easy • ready-to-use commands for getting a change provided by Gerrit • choice between checkout and cherry pick • checkout exactly reproduces what was pushed • cherry-pick adds the change to your current state Freitag, 10. Juni 11
- 23. San Francisco, USA Gerrit FunctionalTests Made Easy • after getting the change run tests and/or test manually • then leave a review in Gerrit Freitag, 10. Juni 11
- 24. San Francisco, USA Gerrit Functionalreview vote here Code review vote here Explain your vote if needed / helpful Freitag, 10. Juni 11
- 25. San Francisco, USA Gerrit Contributinga Change • Git needs to be set up (your name and email must match the Gerrit user) • Upload your SSH public key to Gerrit • Make Git push to Gerrit by default $ git config --global url."ssh://review.typo3.org".pushInsteadOf git://git.typo3.org Freitag, 10. Juni 11
- 26. San Francisco, USA Gerrit Creatingthe Change-ID • Gerrit comes with a commit hook to create the ID • just copy it into every repository • for submodules use this $ scp -p -P 29418 review.typo3.org:hooks/commit-msg .git/hooks/ $ git submodule foreach 'scp -p -P 29418 review.typo3.org:hooks/commit-msg .git/hooks/' Freitag, 10. Juni 11
- 27. San Francisco, USA Gerrit Prepare& Push the Change • make your code change • commit and provide a good commit message • check your change again • push to a virtual branch to create a change set • Gerrit will tell you the URL for the new change $ git log -p origin/master..HEAD $ git push origin HEAD:refs/for/master Freitag, 10. Juni 11
- 28. San Francisco, USA Summary •Gitallows for more efficient work •Gerrit makes code review comfortable •central hub for code comments and change history •functional tests are easy through ready-to-use commands Freitag, 10. Juni 11
- 29. San Francisco, USA ThankYou! • These slides: http://slideshare.net/kfish • Follow me on twitter: @k_fish • Give me feedback: • karsten@typo3.org • http://joind.in/3550 Freitag, 10. Juni 11