Can I retrieve changes from deleted stash?

Can I retrieve changes from deleted stash?

[Daniel]

I did:

$ git stash
$ git pop

$ git checkout -- <modified files>

Now I don't have changes I stashed. I guess the blobs with stashed
files should be somewhere?  Is there any way I can get back my changes?
I tried to use git-reflog, but I'm not sure how can I find the files
I need.

Re: Can I retrieve changes from deleted stash?

[Thomas Rast]

[-- Attachment #1: Type: Text/Plain, Size: 901 bytes --]

Daniel wrote:
> I did:
> 
> $ git stash
> $ git pop
> 
> $ git checkout -- <modified files>
> 
> Now I don't have changes I stashed. I guess the blobs with stashed
> files should be somewhere?  Is there any way I can get back my changes?
> I tried to use git-reflog, but I'm not sure how can I find the files
> I need.

The problem is that the stash itself is a reflog, so there is no extra
safety layer.

Recent versions of the git-stash(1) manpage[*] document a command that
helps find the stashes: if you do not explicitly name them, the they
will be called "WIP on <subject>" and can thus be found with

  git fsck --unreachable |
  grep commit | cut -d\  -f3 |
  xargs git log --merges --no-walk --grep=WIP


[*] you can find a bleeding edge version at

  http://www.kernel.org/pub/software/scm/git/docs/git-stash.html

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Can I retrieve changes from deleted stash?

[mjucde]

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

> Daniel wrote:
> > I did:
> > 
> > $ git stash
> > $ git pop
> > 
> > $ git checkout -- <modified files>
> > 
> > Now I don't have changes I stashed. I guess the blobs with stashed
> > files should be somewhere?  Is there any way I can get back my changes?
> > I tried to use git-reflog, but I'm not sure how can I find the files
> > I need.
> 
> The problem is that the stash itself is a reflog, so there is no extra
> safety layer.
> 
> Recent versions of the git-stash(1) manpage[*] document a command that
> helps find the stashes: if you do not explicitly name them, the they
> will be called "WIP on <subject>" and can thus be found with
> 
>   git fsck --unreachable |
>   grep commit | cut -d\  -f3 |
>   xargs git log --merges --no-walk --grep=WIP
> 
> 
> [*] you can find a bleeding edge version at
> 
>   http://www.kernel.org/pub/software/scm/git/docs/git-stash.html
> 
> -- 
> Thomas Rast
> trast@{inf,student}.ethz.ch
> 

Thanks, that did the trick :)