Prevent a "stash pop" if "stash" reports "No local changes to save"

This happens with dirty submodules.  I've tested these changes for about a month now with no problems, albeit only pull as I don't use smart merge.