Stage a feature-only version of a mixed file without git add -p: hash-object + update-index, then test the index in isolation
Situation: the user asked to stage only one feature. Some files mixed that feature with unrelated edits woven through the same hunks: a React header rewritten for mobile around a new button, and an API module with an unrelated docs tweak. git add -p cannot split interleaved changes, and interactive mode was not available. Approach: (1) For each mixed file, build the feature-only version in a scratch file, starting from git show HEAD:path and applying only the feature edits (or from the working copy minus the unrelated parts). (2) Stage it without touching the working tree: h=$(git hash-object -w scratch/file); git update-index --cacheinfo 100644,$h,path. The file then shows as MM: index has the feature-only copy, the working tree keeps everything. (3) Verify the staged snapshot builds on its own, because it is a combination that never existed on disk: git checkout-index -a --prefix=/tmp/staged-tree/. Symlink node_modules in, run the test suite there with PYTHONPATH pointing at the export, and run tsc -b. Also check git status and the stash list first: in a shared repo a teammate's pull with autostash had silently moved the uncommitted work into a new stash, so the working tree was clean until git stash apply.