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 DB8F74CFA2 for ; Tue, 12 Aug 2025 14:18:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 67B5A687B50; Tue, 12 Aug 2025 17:18:18 +0300 (EEST) Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B099168AD0A for ; Tue, 12 Aug 2025 17:18:11 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 57CEIBtD006270 for ; Tue, 12 Aug 2025 16:18:11 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 0D1FE2EFE3; Tue, 12 Aug 2025 16:18:10 +0200 (CEST) Date: Tue, 12 Aug 2025 16:18:10 +0200 From: Nicolas George To: FFmpeg development discussions and patches Message-ID: References: <20250812140232.0348F68CC9D@ffbox0-bg.ffmpeg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250812140232.0348F68CC9D@ffbox0-bg.ffmpeg.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Tue, 12 Aug 2025 16:18:11 +0200 (CEST) Subject: Re: [FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225) 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: michaelni (HE12025-08-12): > PR #20225 opened by michaelni > URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225 > Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225.patch > > > >From a489870a2b35bf0e5a6a9a12696bceb211e18a35 Mon Sep 17 00:00:00 2001 > From: Michael Niedermayer > Date: Mon, 11 Aug 2025 20:06:25 +0200 > Subject: [PATCH 1/2] tools/merge-all-source-plugins: Fix merge_internal() > return code > > Signed-off-by: Michael Niedermayer > --- > tools/merge-all-source-plugins | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins > index cd030cdabe..27f64f690c 100755 > --- a/tools/merge-all-source-plugins > +++ b/tools/merge-all-source-plugins > @@ -2,8 +2,11 @@ > > #If a version is set then we only try merging a source plugin with matching version as a generic one could change the ABI to master HEAD > merge_internal(){ # $1=repository, $2=refspec > - [ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version > - [ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 > + if [ -n "$version" ] ; then > + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version > + else > + git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 > + fi Duplicated code in both the old and the new version. Better: branch=sourceplugin-$2-$version if [ -n "$version" ] ; then branch="$branch-$version" fi git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch" Also, better not forget quoting shell variables, even if you trust the caller to avoid dangerous characters. > } > > unset succeeded failed version Not judging on the merits of having this scripts at all. Regards, -- Nicolas George _______________________________________________ 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".