From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 10 Apr 2014 14:13:17 +0000 (+0200)
Subject: continuous: Do not commit shark patch - it breaks bisect
X-Git-Tag: fix-allnoconfig~2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/94787176c31362bb000c93f05d1b4180fa18aae3

continuous: Do not commit shark patch - it breaks bisect
---

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index e3d20be..6a9fddb 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -4,6 +4,8 @@ set -e
 
 cd linux
 
+git reset --hard
+
 echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
 
-git am < ../shark-ryu-board-patch.patch
+git apply --index < ../shark-ryu-board-patch.patch