Re: git stash data loss

Jeff King [off-list ref] writes:

quoted

quoted

Hrm. The problem is that after creating the stash, we then run "git
reset --hard" to drop the changes that we just stashed. But that is not
always accurate. It will not usually touch untracked files, but it might
if they have D/F conflicts with tracked files. So we need to replace
that "git reset --hard" with some safer command that will notice we are
about to overwrite untracked files. But I am not sure what that command
would be.

Is this something we still want to keep track of?

Yeah, I think it is worth fixing. It's a somewhat rare case, but data
loss is bad. I was hoping you would respond with "...and here is the
magical incantation of git commands to make the working directory look
like we want". I couldn't come up with one. We may need a new option to
reset or read-tree.

ls-files has an ancient option to show the files "killed"; perhaps
that is the closest thing to what you are looking for.