From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Apr 2012 18:05:57 GMT
Subject: Re: stash refuses to pop
Message-ID: <7vpqbfpim2.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4F847350.3000409@ubuntu.com>

Phillip Susi <psusi@ubuntu.com> writes:

> git stash refuses to apply a stash if it touches files that are
> modified.  Using stash -p to selectively stash some hunks of a file
> and then immediately trying to pop that stash causes this failure
> every time.

I think that is by design.

I do not use "stash -p" and personally, but I think its broken from the UI
point of view.  The point of "stash" is to clear your workspace to a
pristine state, do random things, and after you are done and cleared your
workspace again, apply it to come back to the original state or a state as
if you started your WIP from the updated clean-slate.

So probably the right way to use "stash -p" (if there were such a thing)
would be to stash away the remainder in a separate stash with another
"stash" without "-p" (which will clear your workspace to a pristine state)
and then pop the one you created with "stash -p", I think.