[FFmpeg-devel] [PATCH v2 2/2] tools/merge-all-source-plugins: Check that there are no uncommited changes

Michael Niedermayer michael at niedermayer.cc
Thu May 15 17:23:45 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 4dbfa898723..536e1664a43 100755
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -18,6 +18,17 @@ merge(){ # $1=repository, $2=refspec
     suceeded="$suceeded $2"
 }
 
+error(){
+    echo $1
+    exit 1
+}
+
+git diff --exit-code >/dev/null ||\
+    error "Please commit local changes first"
+
+git diff --cached --exit-code >/dev/null ||\
+    error "Please commit local changes first"
+
 #version="12.34"
 
 merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
-- 
2.49.0



More information about the ffmpeg-devel mailing list