Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-10-19 18:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

tools/merge-all-source-plugins: Fix merge_internal() return code

Browse source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2025-08-11 20:06:25 +02:00 • committed by michaelni
parent 373bd80b16
commit b5b306ca31
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/merge-all-source-plugins
View file

@ -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 #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 merge_internal(){ # $1=repository, $2=refspec
[ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version branch="sourceplugin-$2"
[ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2 if [ -n "$version" ] ; then
branch="$branch-$version"
fi
git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch"
} }
unset succeeded failed version unset succeeded failed version