On Sun, Aug 9, 2015 at 1:07 PM, Johannes Schlüter <johan...@schlueters.de> wrote:
> On Sun, 2015-08-09 at 04:20 +0200, Ferenc Kovacs wrote: > > On Sun, Aug 9, 2015 at 2:33 AM, Johannes Schlüter < > johan...@schlueters.de> > > wrote: > > > > > On Sun, 2015-08-09 at 00:48 +0200, Ferenc Kovacs wrote: > > > > Hannes, David, Johannes: what do you think? should we keep the > current > > > > history (I diffed it and it seems to be the same content, only the > > > > commit metadata, author infor was changed) or should we force push > the > > > > original history (of course for that we should first disable the > email > > > > notifications in the gitolite config)? > > > > > > In general the consequence is that we can't trust the repo anymore. > > > There might be any change in the history. > > > > > > This is only the website, not the php-src repo correct? Then this isn't > > > as critical ... but I think we should still revert it. Anybody with an > > > old clone who isn't careful will eventually create a rather large merge > > > using the old history up to the point where the rewrite started. When > > > pushing that all commits will be sent, again. Also I assume the website > > > update scripts will now see a conflict and eventually stop updating > the > > > website ;-) > > > > > > > yeah, it was only php-web. > > I've force pushed back the original version(albeit I was missing a single > > commit, but I managed to get that one from github even with the same > sha1, > > so we have the same as we had before the accidental push). > > good :-) > > > > > We should probably restrict force pushing to all our "important" > > > branches (web/* etc.) as we do for php-src. > > > > > > > > http://git.php.net/?p=karma.git;a=blob;f=hooks/pre-receive;h=9613854d53e0161e1081409a154fe91c1e130d17;hb=HEAD#l32 > > maybe we could protect the master branches in every repo from force > pushes > > by default. > > For all sounds a bit much, I wouldn't lock out pecl maintainers from > their repos i.e. > > johannes > see https://github.com/php/karma/pull/4 would be glad if somebody could review before merging it, because wasn't able to test it properly. -- Ferenc Kovács @Tyr43l - http://tyrael.hu
