From 5d9cbfaf59c9e5f28c9f571a9a6af2da04338445 Mon Sep 17 00:00:00 2001 From: Jeroen van Meeuwen (Ergo Project) Date: Jan 29 2011 21:11:15 +0000 Subject: Forcefully checkout --- diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh index 7af4fae..a288472 100755 --- a/unity/scripts/respin.sh +++ b/unity/scripts/respin.sh @@ -247,9 +247,10 @@ for version in ${VERSIONS}; do # we cloned earlier, checkout the correct branch and install it somewhere # the process running in mock can find it. cd ${TMPDIR:-/tmp}/spin-kickstarts + git reset --hard HEAD [ ! -z "`git branch -la | grep -E \"^(\*|\s)+ $real_branch\"`" ] && \ - git checkout $real_branch || \ - git checkout --track -b $real_branch origin/$real_branch + git checkout -f $real_branch || \ + git checkout -f --track -b $real_branch origin/$real_branch autoreconf -v && ./configure --prefix=/var/lib/mock/revisor-$version-$arch/root/usr/ && sudo make install cd -