From d942c3164d04fd9ab4420b8d41b5d6ab2dec7700 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 3 Sep 2020 17:02:15 +0200 Subject: [PATCH] git switch does not take commits --- build.sh | 2 +- scripts.d/50-x264.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index d880193..e4a3365 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,7 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash git clone https://git.videolan.org/git/ffmpeg.git ffmpeg cd ffmpeg - git switch $GIT_BRANCH + git checkout $GIT_BRANCH ./configure --prefix=/ffbuild/prefix \$FFBUILD_TARGET_FLAGS $CONFIGURE --extra-cflags="$CFLAGS" --extra-ldflags="$LDFLAGS" make -j\$(nproc) diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index ca662fa..18eb5fc 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -16,7 +16,7 @@ ffbuild_dockerstage() { ffbuild_dockerbuild() { git clone "$X264_REPO" x264 || return -1 pushd x264 - git switch "$X264_COMMIT" || return -1 + git checkout "$X264_COMMIT" || return -1 local myconf=( --disable-cli