I do this all the time and the answer is: I test it. If there's a certain set of changes i wish to commit in one unit, but i have other changes in flight, the

I do this all the time and the answer is: I test it. If there's a certain set of changes i wish to commit in one unit, but i have other changes in flight, then i use staging to prepare and reason about them while being able to diff both staging<->previous and staging<->hdd, make the commit, then stash the hdd state and run tests. Afterwards i can restore the hdd from stash and either amend the commit if necessary, or keep on working.