Re: Re: Git commit disappeared

On Tue, Jan 27, 2015 at 2:09 AM, Hannes Magnusson < hannes.magnusson@gmail.com> wrote: > On Wed, Jan 21, 2015 at 3:40 AM, Maciej Sobaczewski <sobak@php.net> wrote: > > Hello Derick, > > > > firstly, thank you for fast reply. > > > >> It's odd. I did commit to web-pres2 to remove some files that shouldn't > >> be there. But I checked, and it's really to git.php.net :S But if there > >> is a commit on github, and not on git.php.net, that indicates I must > >> have committed it to the first one. I'll remove that commit (and force > >> push it) - hopefully that won't break things. Make a backup though :-) > >> I'll then redo the commit at git.php.net. Would that work? > > > > > > I can redo those commits, no problem. I'm asking out of curiosity, as > this > > is the weirdest sitation with git I've ever had, especially according to > > fact that you didn't do force push. > > > > > Commits from git.php.net to -> github are force push. > > That means, if someone accidentally clicks the "merge pull request" > button on github, or manually pushes stuffz to github, it will be > forcefully overwritten next time git.php.net pushes to github (which > happens after each push to git.php.net). > > There are only 3-4 people that have github karma, so the chances of > this happening should be exceptionally slim... but shit does happen :) > > -Hannes > > -- > PHP Webmaster List Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > yep, this was the reason, Rasmus accidentally merged the PR via the github web interface (as he mentioned at https://github.com/php/web-pres2/pull/1) and the next push to git.php.net owerwrote the github only changes (as we are pushing with --mirror). -- Ferenc Kovács @Tyr43l - http://tyrael.hu