From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7205A4C897 for ; Sat, 9 Aug 2025 05:03:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 95E2F687BAC; Sat, 9 Aug 2025 08:02:57 +0300 (EEST) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6277C687ABE for ; Sat, 9 Aug 2025 08:02:51 +0300 (EEST) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-604bff84741so5115757a12.2 for ; Fri, 08 Aug 2025 22:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754715770; x=1755320570; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=nf9I1jGDEr1rbjpY9It2VlYMN2KMSbVOzKfbo2tOu7w=; b=WBpWbmmfsxVA6FD1Reb4e/OGsqPLgWlpeFRBf+jfqET5x3CPRNRUsmjhgjDtaO+G0z wsOiuTXOzdLESR229NmWNlkXhtv8UZyCYv1t/x0Deg3177n/CMPPAoSZwWJb07/zw5o9 j+T2uBwW2IcLzg9/SfA0lrKUQBzEuW7HozkAdGbXOKZhGTEZiinGmioWjVzz/IXGpUc4 nVCHUCzkI872Sw0sPdNMiBAmETvmRsqparNqETzC5aooLRLHSUDD4MTTuZ4vZvsP8n1g 1IFuL0ED1cH5/DCdiT4Znd9BTPes7ALHeVBp3XkURboIzT/GaO6x4Tx4ZdDk3mnAttrf 8cBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754715770; x=1755320570; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nf9I1jGDEr1rbjpY9It2VlYMN2KMSbVOzKfbo2tOu7w=; b=JBUh2cLsLeSuHf5NaNYozXwaiCpFS5eTM176EGtnVKtNmnfIxfn5wkK3KqKB1/nM3D sveyP7BAjekFhlfS7ubwnHLXr3nQW6HFs1h4QtWWs+8p5xGGHdyxo9n8S8vUHda6tC7n BiTOUgo2RhGzqKBZ2CwnHbAbrAOm/V1WoUCc6Kv0Ey0MN17iQMVvw/7G+mxjZwP3Vmue PJVUVlSLak0eTrPHZvs9VxAt9+nBYD0RmgQES/4tw59vKjyUb4jQh9d98w9egq+ejFS9 T/cdBkzZGkoqZnp5GXxujBUCId6CrpEJanV5VW7H6Jvn46GqOTw8xfwVvoP9jKGBvdpE t8kw== X-Gm-Message-State: AOJu0YyeameYfyjT8ocl6TxpZ7hOHd+A4nCVgejbpB8OP6EBkPgQIiAz 0UoAMbo6zUqZWoGBXHLTcyTR2p3OGPtG/nd1yiOGExS4v2uMKTSKjoBvbLgxOMtsnd3zr01/tb5 hmSYsPbefChle0NkiyjPdx6KdJVG0A0PYGA== X-Gm-Gg: ASbGncscg9FeW4vXddVq8iPivzJeynF8DHBwfgmHGWe3jLe9Bumg8fP4Lw8sT/ZuGjR nvzuPE2IsYIcpAd7c1upSjx4B2fY+a4liBuXPjWma6oqTcJRYK8ADbm4L3xKZKF1YAZT9qSt+j4 QdABtDIjFmTRp0mF9p9oK/PuX4LP5XXDNxeNgU2gaTPKai8M0jXaFKqQSnMFMTnv1JKS297/s4e 2d4xCBAtyAciFE= X-Google-Smtp-Source: AGHT+IFdp+/LZsBL94fTC6Bzgbr2Aihyvbi2CEeyhB40f+EIddn+7BatngtimFmNbsPQ2HjXBbZUq3B1hv3jjKBymgo= X-Received: by 2002:a05:6402:2354:b0:607:ea0c:65b2 with SMTP id 4fb4d7f45d1cf-617e2e829e5mr5040646a12.31.1754715769877; Fri, 08 Aug 2025 22:02:49 -0700 (PDT) MIME-Version: 1.0 References: <20250808230948.GP29660@pb2> <6233111e-537c-4e30-8df4-f1651b9ee5f3@gmail.com> <20250808232854.GQ29660@pb2> In-Reply-To: <20250808232854.GQ29660@pb2> From: Kacper Michajlow Date: Sat, 9 Aug 2025 07:02:29 +0200 X-Gm-Features: Ac12FXzaspBgk83B0aFBES7aVpLgTHwfuqjsncpv9WJuJLm6IVajyo87gcgQVOg Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] rebase bugs? 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sat, 9 Aug 2025 at 01:29, Michael Niedermayer wrote: > > On Fri, Aug 08, 2025 at 08:18:43PM -0300, James Almer wrote: > > On 8/8/2025 8:09 PM, Michael Niedermayer wrote: > > > git log --grep "Clear state on alloc" origin/master --oneline > > > 85a2beaa811 avcodec/ffv1: Clear state on alloc > > > 70fc46d1856 avcodec/ffv1: Clear state on alloc > > > > Yeah, that's not good. The second commit is an empty duplicate. > > but how did this happen ? > > the webpage lists 70fc46d185 (https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20134) > is this some sort multithreading feature where it spwns independant workers > for each and then maybe end up with 2 for one pr ? iam just speculating i have > not looked at one single line of forgejo code > > if thats the case it should have stoped when it realized the comits are empty Hard to guess what has happened. But it definitely looks like Forgejo "merged" this PR twice and the 2nd time it applied empty commits. It looks really amateur on this side of Forgejo. Not only the race condition (probably) that executed merge twice, but also allowing empty commits by default, which git normally warns about. Forgejo should abort at this point... or never do it twice. Quite surprising, because this is a very basic scenario and we are already finding bugs. This is also why my initial intuition in the GitLab vs Forgejo discussion was that GitLab is battle tested and in a corporate environment, things like that would never happen in more mature software. But that's a discussion for another mail thread, my list of forgejo issues is getting longer and longer... > > > > > > > > also not signed, not even with forgejos key: > > It only signs commits if they were signed in the PR prior to rebasing, i > > think. > > git log fforge/pr/20134 -2 --show-signature > commit a99fa230adbe52504e6fadc1a3f85b5c30154349 (fforge/pr/20134, fforge-michaelni/ff-tmp-uninit-ut-vlc-ffv1) > gpg: Signature made Thu 07 Aug 2025 06:33:14 PM CEST > gpg: using EDDSA key DD1EC9E8DE085C629B3E1846B18E8928B3948D64 > gpg: Good signature from "Michael Niedermayer " [ultimate] > gpg: aka "Michael Niedermayer (key used for git commits) " [ultimate] > Author: Michael Niedermayer > Date: Wed Aug 6 13:36:06 2025 +0200 > > avcodec/ffv1: Clear state on alloc > > Fixes: use of uninitialized memory > Fixes: 428969823/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_DEC_fuzzer-5909681623334912 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > > commit 006125030a0c360539c615fa6b5881c9bd78e637 > gpg: Signature made Thu 07 Aug 2025 06:33:13 PM CEST > gpg: using EDDSA key DD1EC9E8DE085C629B3E1846B18E8928B3948D64 > gpg: Good signature from "Michael Niedermayer " [ultimate] > gpg: aka "Michael Niedermayer (key used for git commits) " [ultimate] > Author: Michael Niedermayer > Date: Wed Aug 6 13:09:26 2025 +0200 > > avcodec/utvideodec: Set B for the width= 1 case > > Fixes: use of uninitialized meory > Fixes: 428034093/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_DEC_fuzzer-6195630160805888 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer As far as I've seen Forgejo is only able to sign commits that it produced, like when you create an initial community or edit something in web ui. I've tested a few days ago and neither rebases, nor merge commits were signed by Forgejo and instead all signatures are stripped. And this happens even though Forgejo explicitly says besides the "merge" button, that commit will be signed by key . Never seen this work. > btw: (not sure thats the same issue or a genuine typo, its not empty seem like a genuine typo) Yes, this is my bad, sorry. - Kacper _______________________________________________ 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".