Verify Staging Before Committing
Before every git commit, read git diff --cached --name-status and confirm the commit will hold exactly the files meant for it, no more and no fewer.
Why
No one else's work is swept into a commit, and nothing meant for it is left behind.
How To Apply
- Edit and stage in one call, read the staged status, commit in the next.
- A batched
git add a b caborts on the first bad pathspec and stages nothing new, while earlier staged changes still commit. - Printing the stat in the same chained command as the commit is no check, since the commit runs regardless.
- Never chain the add and the commit: a
git mvorgit rmstaged early rides into an unrelated commit throughgit add ... && git commit. - A hook refuses a commit that follows a
git addin the same command. - Where a project can, a commit-msg hook refuses a
docs(log)commit that holds anything but the log (Request Log).
- A batched
- When earlier
git rmorgit mvcalls of your own left things in the index,git reset -- <your paths>first, then stage each commit's list. - While anyone else works in the tree - the director, a parallel session, a sub-agent - stage by explicit file name, never a bare
git add -Aand never a directory pathspec, which is-Ain disguise. A "changed on disk" note about a file you are not editing is the sign. - Index entries you did not stage are the director's or another session's: leave them staged, and commit only your own paths with
git commit -- <paths>. - If a wrong commit lands and is unpushed:
git reset HEAD~1and redo the staging.- With someone else in the tree,
git reset --soft HEAD~1, unstage only what your own staging swept in, leave their entries as they were, and commit only your own paths withgit commit -- <paths>.
- The index is shared with everything else in the tree: the director stages files too, and a parallel session or a capture run leaves half-done and untracked files beside yours.