mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
* commit '9510d7689e236f6a4748795604fba427c130d0ad': fate.sh: Allow non-fast-forwards when updating sources Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a8fe8d4fe9
|
@ -35,7 +35,7 @@ checkout(){
|
||||||
update()(
|
update()(
|
||||||
cd ${src} || return
|
cd ${src} || return
|
||||||
case "$repo" in
|
case "$repo" in
|
||||||
git:*) git pull --quiet ;;
|
git:*) git fetch --force; git reset --hard origin/master ;;
|
||||||
esac
|
esac
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue