Debug accidentally staging both files in the focused Git commit

Do not start with a speculative fix for the focused Git commit. Force the failure on purpose, save the before output, then change one cause at a time. Retries are allowed only for transient conditions—not for bad input that will fail forever on git-basics.

git restore --staged README.md git status --short

Expected evidence: **README unstaged again**. If you cannot reproduce on demand, you do not yet control the failure mode for `git-basics`.

After repair, rerun the exact reproduction command. Keep the failing fixture as a regression seed for the observability page. For the focused commit for evaluation-script change, remember the claim you are restoring: git show --stat on HEAD lists train.py but not README.md.

Store a one-command reproduction for: accidentally staging both files, or committing from the wrong directory. The command should use repo with dirty train.py (eval) and README.md (docs) or a minimal mutant of it. Paste the failing output into notes/failure-before.txt (or your shell scrollback as copied text). After the fix, paste notes/failure-after.txt and keep both.

Retries belong only on transient faults. If the failure is bad input, a bad allowlist, or a logic bug in the focused Git commit, retrying will amplify cost without repairing trust around land only the tested train.py evaluation change while README edits stay unstaged.

Classify the failure as prevent, detect, contain, or recover—using this lab’s language, not a generic poster. For git-basics, the first fix should usually be detect+prevent at the boundary, because accidentally staging both files, or committing from the wrong directory is cheaper to stop early than to explain in production prose.

At the debugging stage for git-basics, the job is narrower than finishing a product demo. You are creating one progressive evidence piece about repo with dirty train.py (eval) and README.md (docs) that later pages inherit without redefining success. Keep that fixture small enough to inspect by hand, keep outputs copy-pasteable as text, and refuse to narrate this baseline as if it were a production SLA: git status and git diff before any add.

For this page specifically, success looks like before/after evidence for the characteristic failure while still centering the user decision to land only the tested train.py evaluation change while README edits stay unstaged. If you cannot point to a file, command, or assertion that proves that for the focused Git commit, stay on this page instead of advancing.

Git glossary

Previous · Next