Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> + test_when_finished "git stash pop && git stash pop" && > > If it's indeed important to clean up the stashes when the test > finishes, then the test_when_finished() invocation should probably be > a bit more robust... > >> + git stash -- file_x && >> + git stash && > > ... since, as it is now, if an error occurs between these two > git-stash invocations or before them, then there will only be zero or > one stashes, so the double stash-pop by test_when_finished() will > itself errout out. Better, perhaps to do this: > > test_when_finished "git stash pop && git stash pop || :" && > >> + git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual && >> + test_cmp expect actual >> +' There is no "I do not care what is in the stash right now, just clear all"?
