Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> test_expect_success 'checkout -b to a new branch, set to HEAD' ' >> + test_when_finished test_might_fail git branch -D branch2 && >> + test_when_finished git checkout branch1 && > > I'm aware that when-finished actions fire in reverse order but the > inherent subtlety of ordering of these two invocations still caught me > off-guard for a moment since they are reverse the order in which one > logically thinks about the actions which need to be performed. I > wonder if it would be easier to digest if written like this: > > test_when_finished ' > git checkout branch1 && > test_might_fail git branch -D branch2 > ' && Perhaps. Be careful in choosing the quotes between sq and dq, though.