diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2025-08-11 20:06:25 +0200 |
|---|---|---|
| committer | michaelni <michael@niedermayer.cc> | 2025-08-13 11:50:52 +0000 |
| commit | b5b306ca31ba4cc035f4cea3fd82ae43dccd38f3 (patch) | |
| tree | ac4059cfe184628c594080402e8965a605666d6f | |
| parent | 373bd80b16643e349d229e2479fad565dba129a5 (diff) | |
| download | ffmpeg-b5b306ca31ba4cc035f4cea3fd82ae43dccd38f3.tar.gz | |
tools/merge-all-source-plugins: Fix merge_internal() return code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | tools/merge-all-source-plugins | 7 |
1 files 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 |