title: git stash pop fails when swap file is deleted
body: <p>I deleted a swap file and called <code>git stash</code> before making a pull request. When i tried <code>git stash pop</code>, i got following error </p>
  
  <blockquote>
    <p>Cannot apply to a dirty working tree, please stage your changes</p>
  </blockquote>
  
  <p>I followed this <a href="https://stackoverflow.com/questions/1360712/git-stash-cannot-apply-to-a-dirty-working-tree-please-stage-your-changes">wiki</a> and tried to apply via patching the changes. But it is not working. </p>
  
  <p>I guess this message will give some hint</p>
  
  <pre><code>diff --git a/db/.schema.rb.swp b/db/.schema.rb.swp
  deleted file mode 100644
  index 6570b8e..0000000
  Binary files a/db/.schema.rb.swp and /dev/null differ
  </code></pre>
  
  <p>How to resolve this?</p>