From f51c385a8e643ee12eb6be160e2fa4b5ae57a50b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 15 May 2025 15:46:35 +0200 Subject: [PATCH] tools/merge-all-source-plugins: Check that there are no uncommited changes Signed-off-by: Michael Niedermayer --- 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 4dbfa89872..536e1664a4 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"