[hibernate-dev] Fwd: something wrong with our git repo?

[Hardy Ferentschik]

Hi,

this is just heads up that we just did a forced push to the master repo of  
Hibernate Core.
What has happened? For some reason the repo was out of sync with what some  
of us (at least
me and Strong) had in our checkout.
This morning the tip of master contained the following two commits  
66347adca60b61d700d2be2e057e33d1f0487666
and e387a94d5a2b2e6cad44981816b7b7577d76ad3e (both commits from Steve and  
related to HHH-6273 identifier-generator
binding and some logging changes). The parent of these commit was the  
common ancestor which was also in Strong's
and my repo. But our commit contained also several commits from Gail,  
Strong and me which were lost on master
on GitHub.
Assuming that most of are in sync w/ what Strong and I had we pushed our  
master and reapplied the changes from
66347adca60b61d700d2be2e057e33d1f0487666 and  
e387a94d5a2b2e6cad44981816b7b7577d76ad3e. So everyone should check
whether he is in sync w/ master.

The remaining question is how this could happen. As Scott pointed out  
GitHub had some issues (http://status.github.com/).
This could be a reason. The other option would be a forced pushed by  
someone else. But surely we wouldn't d that, right?
At least not w/o giving everyone a heads up :-)

--Hardy



On Wed, 01 Jun 2011 04:55:54 +0200, Strong Liu <stliu at hibernate.org> wrote:

>> From: Strong Liu <stliu at redhat.com>
>> Date: June 1, 2011 10:47:08 AM GMT+08:00
>> To: Hibernate Dev <hibernate-dev at lists.jboss.org>
>> Subject: something wrong with our git repo?
>>
>> from https://github.com/hibernate/hibernate-core/commits/master, the  
>> latest commit is in 2011-05-27 from Steve, e387a94d5a2b2e6cad44
>> but i'm sure Hardy merged my pull request yesterday, and i also pushed  
>> once yesterday....
>> dont know why, and from the gitx log, it seems we have some commits lost