From b5b306ca31ba4cc035f4cea3fd82ae43dccd38f3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 Aug 2025 20:06:25 +0200 Subject: [PATCH] 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..194a30fae2 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 + branch="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