mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-17 15:08:09 +08:00
39 lines
1.1 KiB
Bash
Executable File
39 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
#If a version is set then we only try merging a source plugin with matching version as a generic one could change the ABI to master HEAD
|
|
merge_internal(){ # $1=repository, $2=refspec
|
|
[ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2-$version
|
|
[ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2
|
|
}
|
|
|
|
unset suceeded failed version
|
|
|
|
merge(){ # $1=repository, $2=refspec
|
|
merge_internal "$1" "$2" || {
|
|
git reset --hard
|
|
echo merge of $1 $2 failed, continuing with other plugins
|
|
failed="$failed $2"
|
|
return 0
|
|
}
|
|
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"
|
|
|
|
[ -n "$version" ] && echo version: $version
|
|
[ -n "$suceeded" ] && echo Succeeded merging: $suceeded
|
|
[ -n "$failed" ] && echo Failed merging: $failed
|