From 5b4e64c3059fe5b79c9ee06f772ae5dea90e6f59 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 11 Oct 2016 13:58:06 +0200 Subject: coverity: don't pull --rebase, instead fetch and reset --hard Change-Id: Ida553a0f38c438a02139396512ff5da038359721 --- coverity/build_Osmocom.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 6aaf5fb..d00ad51 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -10,11 +10,15 @@ install -d "$prefix" export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" +git_branch() { + echo "$(git status)" | grep 'On branch' | sed 's/On branch //' +} + do_build() { + git fetch + git reset --hard "origin/$(git_branch)" git clean -dxf git checkout . - git remote prune origin - git pull --rebase -s recursive -Xtheirs autoreconf --install --force ./configure --prefix="$prefix" $* -- cgit v1.2.3