Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] videolan ffmpeg git issue [please dont push before reading]
Date: Sat, 25 Feb 2023 23:11:17 +0100
Message-ID: <20230225221117.GB1949656@pb2> (raw)
In-Reply-To: <20230225104551.GZ1949656@pb2>


[-- Attachment #1.1: Type: text/plain, Size: 2071 bytes --]

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
> > 
> > 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 rewond
> > HEADs- So if you push something (when its possible again) please make sure
> > that teh commits match the previous (pre restore) ones
> > 
> > Its not the end of the world if others are pushed, we would then need
> > a merge commit to reconcile these 2 histories
> 
> Some update
> 
> videolan took this opertunity to switch the repositories from EOL gitosis 
> 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
> 
> 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. 
> 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 happened
temporarly as one of 2 sync scripts aparently force pushed teh receeded HEADs

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 morning

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle 

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

      reply	other threads:[~2023-02-25 22:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-25  1:14 Michael Niedermayer
2023-02-25  7:07 ` Gyan Doshi
2023-02-26  0:50   ` Michael Niedermayer
2023-02-25 10:45 ` Michael Niedermayer
2023-02-25 22:11   ` Michael Niedermayer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230225221117.GB1949656@pb2 \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git