[FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225)

[Michael Niedermayer]

On Tue, Aug 12, 2025 at 04:18:10PM +0200, Nicolas George wrote:
> 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 <michael at niedermayer.cc>
> > 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 <michael at niedermayer.cc>
> > ---
> >  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.

changed

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250812/65ab4c9f/attachment.sig>