Only pop stash if changes were stashed when shamending