ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu May 15 15:46:35 2025 +0200| [f51c385a8e643ee12eb6be160e2fa4b5ae57a50b] | committer: Michael Niedermayer
tools/merge-all-source-plugins: Check that there are no uncommited changes Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f51c385a8e643ee12eb6be160e2fa4b5ae57a50b --- 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" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
