Merge branch 'cb/maint-stash-orphaned-file'

* cb/maint-stash-orphaned-file: stash tests: stash can lose data in a file removed from the index stash: Don't overwrite files that have gone from the index