mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-15 11:30:08 +01:00
tools/merge-all-source-plugins: Check that there are no uncommited changes
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
@@ -18,6 +18,17 @@ merge(){ # $1=repository, $2=refspec
|
|||||||
suceeded="$suceeded $2"
|
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"
|
#version="12.34"
|
||||||
|
|
||||||
merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
|
merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
|
||||||
|
|||||||
Reference in New Issue
Block a user