A presentation at React Conf in in Henderson, NV, USA by Monica Powell
git is hard but time travel in git is easy. PRESENTATION BY MONICA POWELL @waterproofheart 🔗 www.aboutmonica.com/
Agenda Hi, I’m Monica Powell. I am a Full Stack Engineer at Meetup and organizer of the React Ladies community. Owner of too many domains including www.monica.dev. In a committed relationship with git. @waterproofheart
What is git? A distributed version-control system for tracking changes in source code during software development. @waterproofheart 🔗 www.aboutmonica.com/
What do GitLab, GitHub and Bitbucket have in common? @waterproofheart 🔗 www.aboutmonica.com/
TIME TRAVEL IN GIT It’s not a bug! It’s a feature. @waterproofheart 🔗 www.aboutmonica.com/
DEBUGGING @waterproofheart 🔗 www.aboutmonica.com/
CREATE FUTURE COMMIT Checkout new branch Change computer time & replicate issue locally Squash bug and fix issue Commit and push fix Oops! 😬 @waterproofheart 🔗 www.aboutmonica.com/
That’s not the only way to commit in the future…
How does language detection on GitHub.com work? @waterproofheart 🔗 www.aboutmonica.com/
Reclassify Auto-Detected Language With One Line of Code @waterproofheart 🔗 www.aboutmonica.com/
Linguist library • An open-source GitHub project to generate language breakdown graphs. • Supposed to ignore vendored (third-party ) files (i.e., Bootstrap, Node Modules) • If a programming language isn’t listed in the Linguist’s YAML file, as far as Linguist in concerned it doesn’t exist. https://github.com/github/ linguist/blob/master/lib/linguist/languages.yml @waterproofheart 🔗 www.aboutmonica.com/
.gitattributes and Linguist One-line change to reclassify my project from 98.9% CSS to 56.2% Python and 43.8% HTML 1) Create a .gitattributes file with the below one-liner: 2) reclassifies the repo according to the new rule in the .gitattributes ignoring the /static directory and treating it as third-party code. Note: Linguist ignores third-party, node_modules/ and bower_components/ by default. @waterproofheart 🔗 www.aboutmonica.com/
Git Hooks: You already have them! Under the hood of git repositories Every Git repository has a hidden .git/hooks directory with sample bash scripts for each hook you can bind to. These can be modified. @waterproofheart 🔗 www.aboutmonica.com/
Git Hooks Workflow Automate your local git workflow @waterproofheart 🔗 www.aboutmonica.com/
Git Hooks Ideas ” Warn when committing to master ” Run Prettier, ESLint and Jest tests before committing ” Warn or abort when committing code with: console.logs(), sensitive credentials, merge conflict strings or large files. ” Send notifications after a commit is pushed ” Sending intl objects to be translated ” And 1270824+ other ways. @waterproofheart 🔗 www.aboutmonica.com/
Pre-Commit Hook Example Warn when committing to master Run linting and tests before committing Warn or abort when committing code with: console.logs(), sensitive credentials, merge conflict strings or large file Send notifications after a commit is pushed Sending intl objects to be translated And 1270824+ other ways. @waterproofheart 🔗 www.aboutmonica.com/
CLI Output of Pre-Commit Hook @waterproofheart 🔗 www.aboutmonica.com/
Linting Hooks in Package.json with Husky 🐶 @waterproofheart 🔗 www.aboutmonica.com/
Limitations of Git Hooks ” Limited enforcement - can easily be overridden —no-verify, —no-merge, — no-checkout or forced pushes ” Local hooks != shared hooks as .git/hooks not in version control (although with Husky you can add hooks to package.json which is in version control) ” Doesn’t replace CI, server-side branch protection or code reviews @waterproofheart 🔗 www.aboutmonica.com/
Helpful Git Resources • Git Lens Plugin https://gitlens.amod.io/ • Git Books https://git-scm.com/book/en/v2 • git-together — better attribution • https://github.com/kejadlen/git-together Husky 🐶 https://github.com/typicode/ husky • Git Attributes templates https://github.com/alexkaratarakis/ gitattributes Git Hooks 101 Website https://githooks.com/ @waterproofheart • Git Hook Templates https://github.com/pre-commit/pre-commithooks • Linguist Library https://github.com/github/linguist/ 🔗 www.aboutmonica.com/
This talk will cover how I accidentally discovered time travel in git, how to tell GitHub what languages a repository is composed of & other Git/GitHub hacks to make working with it more delightful (or maybe just make your commit history less embarrassing) with git hooks.
The following resources were mentioned during the presentation or are useful additional information.
A tool for better git attribution
🐶 Git hooks made easy
Here’s what was said about this presentation on social media.
for free. You
can too.