From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6D8C444E2C for ; Sat, 25 Feb 2023 22:11:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AD0268BD1E; Sun, 26 Feb 2023 00:11:27 +0200 (EET) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E38A868B890 for ; Sun, 26 Feb 2023 00:11:19 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 7376CFF806 for ; Sat, 25 Feb 2023 22:11:18 +0000 (UTC) Date: Sat, 25 Feb 2023 23:11:17 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20230225221117.GB1949656@pb2> References: <20230225011444.GY1949656@pb2> <20230225104551.GZ1949656@pb2> MIME-Version: 1.0 In-Reply-To: <20230225104551.GZ1949656@pb2> Subject: Re: [FFmpeg-devel] videolan ffmpeg git issue [please dont push before reading] X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============6247225172378278026==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============6247225172378278026== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2Bdqe1Grnm6v3UGK" Content-Disposition: inline --2Bdqe1Grnm6v3UGK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 25, 2023 at 11:45:51AM +0100, Michael Niedermayer wrote: > On Sat, Feb 25, 2023 at 02:14:44AM +0100, Michael Niedermayer wrote: > > Hi all > >=20 > > it seems videolan had a double RAID failure and was restored from backup > > that caused ffmpeg developer git for master and release/5.1 to rewind by > > a few commits. > > It would be slightly messy if different commits are pushed on that rewo= nd > > HEADs- So if you push something (when its possible again) please make s= ure > > that teh commits match the previous (pre restore) ones > >=20 > > Its not the end of the world if others are pushed, we would then need > > a merge commit to reconcile these 2 histories >=20 > Some update >=20 > videolan took this opertunity to switch the repositories from EOL gitosis= =20 > to gitolite. This added some hickups > first being some nonworkingness with multiple admins in gitolite. Which > i belive was due to single keys being used with multiple users, i fixed > that for a 2nd key i added so it seems thats the issue >=20 > and a 2nd issue that causes branches & heads to disappear from public view > when one pushed to them i suspect thats a permission / user/group issue > but i cannot verify or fix this.=20 > ATM thresh is sleeping and i suspect these issues will be fixed once he > awakes The permissions have been fixed by thresh. Ive added the missing commits back, and pushing seems to work again. Ive also changed our github mirror config so it cannot receed as that happe= ned temporarly as one of 2 sync scripts aparently force pushed teh receeded HEA= Ds There are still some issues with git hooks. So pushing may not be protected against trailing whitespace or such things. Also the ML and IRC may not receive log mails. Thresh plans / is working on the hooks this evening. They are expected to be workinhg againg in the european morni= ng thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The educated differ from the uneducated as much as the living from the dead. -- Aristotle=20 --2Bdqe1Grnm6v3UGK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCY/qHfgAKCRBhHseHBAsP q1ejAJ4+Go1TpSw/qUlCzPVSRWf/JjwbJQCfbem2A7SAkQkD66iEUrbWOJs2V7Q= =QVAL -----END PGP SIGNATURE----- --2Bdqe1Grnm6v3UGK-- --===============6247225172378278026== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============6247225172378278026==--