From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 29 Jan 2012 17:45:16 +0000 (+0100)
Subject: keep local branches alive when running clean
X-Git-Tag: xonotic-v0.6.0~30^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca878e8b74be9f6f7a7f8b8f00820ba447fc6f3d;p=xonotic%2Fxonotic.git

keep local branches alive when running clean
---

diff --git a/misc/tools/the-big-benchmark/the-big-benchmark.sh b/misc/tools/the-big-benchmark/the-big-benchmark.sh
index 667e413f..b67015cb 100755
--- a/misc/tools/the-big-benchmark/the-big-benchmark.sh
+++ b/misc/tools/the-big-benchmark/the-big-benchmark.sh
@@ -12,7 +12,8 @@ echo " ================="
 echo
 if [ -f ./all ]; then
 	echo "WARNING: running this script will destroy ANY local changes you"
-	echo "might have on the repository that haven't been pushed yet."
+	echo "might have on the repository that haven't been pushed or stored"
+	echo "in a local branch yet."
 	echo
 	if [ x"$1" != x"--yes" ]; then
 		echo "Are you absolutely sure you want to run this?"
@@ -34,7 +35,7 @@ if [ -f ./all ]; then
 fi
 
 if [ -f ./all ]; then
-	./all clean --reclone
+	./all clean -fU -m -r
 	./all compile -r
 	export USE_GDB=no
 	set -- ./all run "$@"
@@ -70,7 +71,7 @@ for e in omg low med normal high ultra ultimate; do
 	cat data/benchmark.log >> data/the-big-benchmark.log
 done
 if [ -f ./all ]; then
-	./all clean -r -f -u
+	./all clean -r
 fi
 
 rm -f data/benchmark.log