Re: git stash pop not reapplying deletions

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 16, 2010, 02:17 UTC
Message-ID: <7v7hqdrkjb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201002142308.01704.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

Show 6 quoted lines

> The problem is that you aren't using --index, but still expecting it
> to restore your index.  If you change it to 'git stash pop --index',
> everything will work as expected.
>
> Yes, it does stage new files, but that is only to help you: otherwise
> you could forget them before committing.

I think the reason _new_ files are added is simply because ack then there was no other way to make it tracked.

A sane thing to do these days might be to add a newly created file with the "intent to add" option, to mimic the way other files in the work tree with changes are unstashed. They get the full change in the work tree, without restoring what their corresponding index entry used to have when the stash was made, if you unstash without the --index option.