Recovering a patch accidentally removed by git reset

[Jeff L]

How do you get a patch back that you have managed to remove completely 
from your system with a
git reset HEAD^
git reset
git checkout patchname ?

git fetch does not seem to refresh the patch from the repository.  I was 
going fairly well with git then stuffed this up.

Jeff

[Saulius Krasuckas]

* On Wed, 20 Sep 2006, Jeff L wrote:
> How do you get a patch back that you have managed to remove completely from
> your system with a
> git reset HEAD^
> git reset
> git checkout patchname ?

What branch you were on during this?
> git fetch does not seem to refresh the patch from the repository.  I was 
> going fairly well with git then stuffed this up.

Hmm, old git (1.0.4) can do it by "git rebase origin" here on my stable 
debian box.

[Jeff Latimer]

Saulius Krasuckas wrote:
> - On Wed, 20 Sep 2006, Jeff L wrote:
> > How do you get a patch back that you have managed to remove completely from
> > your system with a
> > git reset HEAD^
> > git reset
> > git checkout patchname ?
>
> What branch you were on during this?

This was the Origin or Master
> Hmm, old git (1.0.4) can do it by "git rebase origin" here on my stable 
> debian box.

Looking at the log the last couple of patches were:

commit 15b46847b0bc4d9bcc2b03d9377ce7342f4da536
Author: James Hawkins 
Date:   Wed Sep 13 17:18:23 2006 -0700

setupapi: Add stubs for SetupOpenLog, SetupCloseLog, and SetupLogError.

commit 7588b669d8331ff64fc3b75cebe40ef518cd0de1
Author: James Hawkins 
Date:   Wed Sep 13 14:19:12 2006 -0700

setupapi: Implement pSetupGetField, with tests.

They still seem to be there so I don't even know if I did delete a patch.

Jeff

[Saulius Krasuckas]

* On Wed, 20 Sep 2006, Jeff Latimer wrote:
> - Saulius Krasuckas wrote:
> > - On Wed, 20 Sep 2006, Jeff L wrote:
> > > How do you get a patch back that you have managed to remove 
> > > completely from your system with a
> > > git reset HEAD^
> > > git reset
> > > git checkout patchname ?
> >
> > Hmm, old git (1.0.4) can do it by "git rebase origin" here on my stable
> > debian box.
>
> Looking at the log the last couple of patches were:
>
> commit 15b46847b0bc4d9bcc2b03d9377ce7342f4da536
> Author: James Hawkins 
> Date:   Wed Sep 13 17:18:23 2006 -0700
>
> setupapi: Add stubs for SetupOpenLog, SetupCloseLog, and SetupLogError.
>
> commit 7588b669d8331ff64fc3b75cebe40ef518cd0de1
> Author: James Hawkins 
> Date:   Wed Sep 13 14:19:12 2006 -0700
>
> setupapi: Implement pSetupGetField, with tests.
>
> They still seem to be there so I don't even know if I did delete a patch.

Hm, and what branch does this come from?

Are there any difference between your recently used branches:
git-whatchanged origin
git-whatchanged master
git-whatchanged patchname
git diff origin..master
git diff origin..patchname
git diff master..patchname

?

[Mike McCormack]

Jeff L wrote:
> How do you get a patch back that you have managed to remove completely 
> from your system with a
> git reset HEAD^
> git reset
> git checkout patchname ?
>
> git fetch does not seem to refresh the patch from the repository.  I was 
> going fairly well with git then stuffed this up.

If the patch you "uncommitted" with "git reset" is your own, you can 
search for it with "git fsck-objects".  That will give you a list of 
SHA1 commit IDs (and perhaps other objects).  You can check what is in 
each commit with "git log SHA1ID".

If you've just "uncommitted" one of Alexandre's commits, first make sure 
that you have the master branch checked out:

bash-2.05b$ git branch
* master
   origin

Unless you've made more branches, "master" is your, and "origin" is 
Alexandre's.

Then try:

git checkout master
git rebase origin

That should bring your "master" back in line with the "origin" branch.

I did a presentation on Git at wineconf, you can see it here:

http://mandoo.dyndns.org/git-presentation/git-wine.html

Mike