stash: handle staged changes in skip-worktree files correctly