Hey Lorna Jane,
Why not have the best of both worlds?

2. Next, do [code]git add -p[/code] and stage anything that is relevant to the thought you were just having
-3. Now [code]git commit[/code] and write a note to future Lorna in the commit message
+3. Run [code]git stash --keep-index[/code], build and test.
+4. If everything runs to your liking, run [code]git commit[/code] and write a note to future Lorna in the commit message