From 0ce6f62c0b2986f5d8cca695286c1b3217d6be67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Sat, 17 Aug 2013 08:14:07 +0200 Subject: [PATCH] do bisect reset, not checkout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- dev/tests/correct-pony+f | 2 +- dev/tests/correct-pony-f | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/correct-pony+f b/dev/tests/correct-pony+f index 61f5c177..9a09069c 100755 --- a/dev/tests/correct-pony+f +++ b/dev/tests/correct-pony+f @@ -24,7 +24,7 @@ if [ ! "$(./src/__main__.py -oX +f firefox 3>&1 >/dev/null | head -n 1)" = "pony # This part is a little hacky as I assume git use locale settings for the language and there seems to be no good way to automate a bisect. nowlog="$(git bisect log | tail -n 1)" if [ "${nowlog}" = "${lastlog}" ]; then - git checkout master + git bisect reset exit 1 fi done diff --git a/dev/tests/correct-pony-f b/dev/tests/correct-pony-f index 253c7fa9..f4590aa8 100755 --- a/dev/tests/correct-pony-f +++ b/dev/tests/correct-pony-f @@ -24,7 +24,7 @@ if [ ! "$(./src/__main__.py -oX -f sweetiesing 3>&1 >/dev/null | head -n 1)" = " # This part is a little hacky as I assume git use locale settings for the language and there seems to be no good way to automate a bisect. nowlog="$(git bisect log | tail -n 1)" if [ "${nowlog}" = "${lastlog}" ]; then - git checkout master + git bisect reset exit 1 fi done