Re: IMPORTANT: accidental force push in master
Simon Marlow <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
On 27/09/2012 09:00, Johan Tibell wrote: > On Thu, Sep 27, 2012 at 3:12 AM, Ilya Sergey <[email protected]> wrote: >> Do not pull master!! >> >> I think, I messed up terribly by making a "force" git push into master. >> As a result, the commit history since 21 august was lost. >> >> Could someone, please, restore the history by push a right commit history >> since then. >> >> I am very sorry for this. > > Someone might be able to recover the lost commits directly from the GHC repo by > > 1. Logging into the machine > 2. Taking a copy of the whole repo > 3. Using the git reflog to undo the push > > This will only work if git gc hasn't been run on the repo. I just did this, resetting to the previous entry in the reflog, which was Edward's patch: commit d3128bfc286002862e916296629a22f1ce987e4e Author: Edward Z. Yang <[email protected]> Date: Mon Sep 17 18:28:49 2012 +0200 Partially fix #367 by adding HpLim checks to entry with -fno-omit-yields. I think we're ok now, I've also mirrored to github and it looks ok there too. Ilya - did you push to any branches other than master? Cheers, Simon