stash clear, was Re: git: avoiding merges, rebasing

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 19, 2007, 13:37 UTC
Message-ID: <Pine.LNX.4.64.0710191533490.16728@wbgn129.biozentrum.uni-wuerzburg.de>
In-Reply-To: <47023699.3080606@byu.net>

Hi,

On Tue, 2 Oct 2007, Eric Blake wrote:

Show 24 quoted lines

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> [adding the git list]
> 
> According to Bruno Haible on 10/2/2007 5:50 AM:
> > Hello Benoit,
> > 
> >>>     $ git stash
> >>>     $ git pull
> >>>     $ git stash apply
> >>>     $ git stash clean              ; typo!
> >>>     $ git stash clear              ; fatal correction to typo!
> >>>
> >>> and lost 20 modified files. Well, not really lost. Just took me a  
> >>> while to
> >> I don't really see how and why you "lost 20 modified files".
> > 
> > I lost modifications to 20 files. "git stash clean" moved these modifications
> > into a stash named "clean", and "git stash clear" killed it.
> 
> While we're at it, I wish 'git stash clear' would take an optional 
> argument that says which stash(es) to clear, rather than blindly 
> clearing the entire stash.

I'd rather avoid "enhancing" stash clear. IMHO it is a little misdesigned, making it way too easy to hang yourself.

Instead, how about writing a stash pop? "git stash pop [<stash>]". It would literally just call git stash apply && git reflog delete. Should not be too difficult, now that I provided "git reflog delete" ;-)

Maybe even deprecating "git stash clear", or doing away with it altogether.

Ciao, Dscho