geelen/git-smart — pull request #19 by mgsloan (2013-07-05 10:21:14+00:00)
Title: 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.