title: git cherry-pick says local changes exist, but git status says nothing
body: <pre>$ git cherry-pick 5de83068
  error: Your local changes to the following files would be overwritten by merge:
          Components/ApplicationEnums/Application.cs
  Please, commit your changes or stash them before you can merge.
  Aborting
  
  $ git status
  # On branch master
  nothing to commit (working directory clean)
  </pre>
  
  <p><strong>UPDATE</strong> Sorry, I switched to another branch, and switched back again, and can't reproduce this anymore :(</p>