From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 1 Mar 2010 14:30:46 +0000 (+0100)
Subject: Tweak swtich back to testing main branch
X-Git-Tag: Release-5.2.1~1660
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44622ccddfefd7940b8d1f3ffc32f43fc0c70d52;p=bacula%2Fbacula

Tweak swtich back to testing main branch
---

diff --git a/regress/nightly-disk b/regress/nightly-disk
index 6f199012a7..c4f689ccc6 100755
--- a/regress/nightly-disk
+++ b/regress/nightly-disk
@@ -14,10 +14,10 @@ git pull
 # Temp switch to branch Branch-5.0 NB this leaves you on a headless
 #    branch, but it works for building and testing.
 #
-git checkout `git branch -r | grep "5\.0" | head -1`
-if [ $? -ne 0 ]; then
-   git checkout master
-fi
+#git checkout `git branch -r | grep "5\.0" | head -1`
+#if [ $? -ne 0 ]; then
+#   git checkout master
+#fi
 make distclean
 scripts/config_dart
 make setup