[FFmpeg-devel] [PATCH 1/2] tools/merge-all-source-plugins: Try merging a tag or branch matching the current version first

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 tools/merge-all-source-plugins | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 tools/merge-all-source-plugins

diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
old mode 100644
new mode 100755
index 20764a07737..05f4fe5e97b
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -1,3 +1,10 @@
 #!/bin/sh
 
-git pull --no-rebase --log --stat --commit --no-edit  https://github.com/michaelni/FFmpeg.git sourceplugin-libpostproc
+merge(){ # $1=repository, $2=refspec
+    git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2-$version || \
+    git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2
+}
+
+version="master"
+
+merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
-- 
2.49.0