4 ms·
Interesting, so you commit things that are different from the code that is sitting in your working directory at the time of the commit?
by ori_b 8y ago
Interesting, so you commit things that are different from the code that is sitting in your working directory at the time of the commit?
- war1025 8y agoI use `git add -p` to selectively pick out chunks of code that fit together into commits. Later on, if I notice that I messed something up, I'll create a fixup commit and do an interactive rebase to squash it back into the correct commit.
- e3b0c 8y agoIn my opinion, `git add -p` should be the default, and a `-a` or alike to forcibly commit the entire working tree. I have developed a habit that I wouldn't feel comfortable if I haven't reviewed the chunks I am going to make into the commit.
- erik_seaberg 8y agoWhereas I don't feel comfortable with untested work, so "git checkout -p" (undo a change) and "git stash -p" (postpone a change) are how I get the workspace clean enough to commit.
- Rychard 8y agoWhile there are many people who don't understand git's staging area, there are far less that understand how to selectively stage/commit chunks, or even that such functionality is available at all. It should be a crime for people to blindly stage everything. Cleaning up after my colleagues easily falls under the "lost cause" umbrella.
- black-tea 8y agoMagit, for emacs, makes this workflow a joy. The "instant fixup/squash" features are great.
- phs2501 8y agoYes, all the time. Stage individual hunks or individual lines in `git gui` to clean up history or avoid commiting debugging hash.
- ori_b 8y agoHow do you test these intermediate commits, given that they're different from what's on disk?
- war1025 8y agoUsually I test the end result. Or the commits are disjoint enough that I am confident that they don't interfere with each other. If I really care about things being fully correct at each commit, I'll do an interactive rebase and just stop and test on each commit.
- doublerebel 8y agoCI/CD. I push, it tests, I keep staging and working.
- laughinghan 8y agoIn the case of console.log() and debugger breakpoints, that's not a concern. Often they're disjoint enough that I'm confident that if the end result works, the intermediate commit works, as the sibling commenter mentioned. (Even if not, on many teams it all gets squashed anyway, the intermediate commit message just makes the Pull Request easier to review.) I can also often easily comment out the uncommitted stuff. Finally, if I'm really worried about it, after creating the intermediate commit I can just `git stash`, test it, then `git stash pop` and keep working.
- black-tea 8y agoAbsolutely. Every single day. Only the most trivial changes result in commiting everything in my working tree.