atomic commits

Transcript

1. atomic commits Kai Höwelmeyer @kaihowl git aficionados meetup 01/21/14
2. atomic commit A commit only containing changes that logically belong together and cannot be split up any further without breaking the intent of the commit.
3. Keep the history clean. Convey intent. Don’t repeat the diff.
4. Features are seldom straight- forward. But your commits should be!
5. Dissect your feature into: Necessary changes & the actual feature implementation
6. But how?
7. Commit early and often on a feature branch. It  works   Fixed  a  typo   Added  a  test   Refactored  a   li6le   Added   another  part   Improved   performance  
8. When done, git  merge  -­‐-­‐squash       on master Master   Commit  1   Master   Commit  2   …   Master   Commit  n   Our  enBre   feature   staged  
9. Now git  reset  
10. Then git  add  -­‐p   Only choose hunks that belong into one atomic commit. Master   Commit  1   Master   Commit  2   …   Master   Commit  n   Remainder   unstaged   Atomic   Commit  1   staged  
11. Check with          git  diff  -­‐-­‐staged     Master   Commit  1   Master   Commit  2   …   Master   Commit  n   Remainder   unstaged   Atomic   Commit  1   staged  
12. Commit with meaningful message. Master   Commit  1   …   Master   Commit  n   Atomic   Commit  1   Remainder   unstaged  
13. git  stash  -­‐u   Leaves clean working copy. Check integrity of system. Master   Commit  1   …   Master   Commit  n   Atomic   Commit  1   Remainder   stashed  
14. git  stash  pop   Stage next atomic commit with git  add  -­‐p     Master   Commit  1   …   Master   Commit  n   Atomic   Commit  1   Remainder   unstaged   Atomic   Commit  2   staged  
15. Final check git  diff  ..feature-­‐branch     Did I commit everything?
16. Next time Determine code ownership w/ log & blame -  or - How I fell in love with vim-fugitive
17. @kaihowl
18. Image Sources •  http://www.flickr.com/photos/lij/ 122525716/sizes/l/ •  http://www.flickr.com/photos/ diorama_sky/4557914779/sizes/l/ •  http://www.flickr.com/photos/ camknows/3821001012/