[FFmpeg-devel] [PATCH 2/2] tools/merge-all-source-plugins: Check that there are no uncommited changes
Michael Niedermayer
michael at niedermayer.cc
Thu May 15 16:04:13 EEST 2025
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
tools/merge-all-source-plugins | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index 05f4fe5e97b..231d9ddcb64 100755
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -5,6 +5,17 @@ merge(){ # $1=repository, $2=refspec
git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2
}
+error(){
+ echo $1
+ exit 1
+}
+
+git diff --exit-code >/dev/null ||\
+ error "Please commit local chanegs first"
+
+git diff --cached --exit-code >/dev/null ||\
+ error "Please commit local chanegs first"
+
version="master"
merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
--
2.49.0
More information about the ffmpeg-devel
mailing list