We at the #jenkins channel in IRC were just wondering what the 'recovery' branch is.
I think it makes sense to bring back 'master' to 'recovery' where it is fast-forward, but let's walk bit slowly here... 2013/11/11 Luca Milanesio <[email protected]> > Good news from GitHub: they have extracted the full list of SHA-1 before > the forced push ! > Many thanks to Nathan Witmer :-) > > See below the full CSV with the SHA-1. > He created as well a branch named 'recovery' that points to the candidate > point for restoring the master branch. > > Hope this will help to sort out the remaining repos. > > Luca. > > > Hi Luca. > > > > Oh man, that sinking feeling! > > > > But, no worries: I've gone through each of the repos listed above and > done the following: > > > > * retrieved the SHA for the previous `master` before you force-pushed > > * created a branch called `recovery` pointing to each former master > > > > In some cases, these are the same. > > > > I can go further and reset the master refs to their former shas if you'd > like, or you can recover these yourself. To do so, in each repo: > > > > $ git fetch > > $ git checkout master > > $ git reset --hard origin/recovery > > $ git push --force origin master > > > > I've attached a csv containing the shas (former master and forced > master) for each branch, for your reference. > > > > Good luck! > > > > Nathan. > > > On 11 Nov 2013, at 22:08, Kohsuke Kawaguchi <[email protected]> > wrote: > > > On 11/11/2013 12:23 PM, Kohsuke Kawaguchi wrote: > >> > >> Yes, I was thinking about the same. The last run of this is Nov 9, > >> 11:24pm in EST. > >> > >> I really hope this is before the incident. But I'll find out soon. > > > > Unfortunately, it appears that the last sync process has run after > luca's "push -f". > > > > I'll hold on to this repo just in case, but resurrecting lost commits > from this appears hopeless. > > > >> > >> On 11/11/2013 12:15 AM, Vojtech Juranek wrote: > >>> On Sunday 10 November 2013 21:40:28 Luca Milanesio wrote: > >>>> That's really pitty :-( ... force push are dangerous, especially if > you > >>>> don't have control over the Git Server. > >>> > >>> I wonder if we can use our all.git [1] somehow (in the worst case > scenario > >>> that github doesn't help us). When it try to clone it, it fails with > remote > >>> error and when looking into web UI the changes are already > synchronized with > >>> github. But IMHO still worth to investigate, orphan commits could > still be > >>> there > >>> > >>> [1] http://git.jenkins-ci.org/?p=all.git;a=summary > >>> > >> > >> > > > > > > -- > > Kohsuke Kawaguchi | CloudBees, Inc. | http://cloudbees.com/ > > Try Jenkins Enterprise, our professional version of Jenkins > > > > -- > > You received this message because you are subscribed to the Google > Groups "Jenkins Developers" group. > > To unsubscribe from this group and stop receiving emails from it, send > an email to [email protected]. > > For more options, visit https://groups.google.com/groups/opt_out. > > > -- > You received this message because you are subscribed to the Google Groups > "Jenkins Developers" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/groups/opt_out. > > -- Kohsuke Kawaguchi -- You received this message because you are subscribed to the Google Groups "Jenkins Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
