From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 19 Sep 2015 11:52:29 +0000 (+0200)
Subject: continuous: Improve patch script to make bisecting easier
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/866045091f219f58008d59bee847537f41b44ca9

continuous: Improve patch script to make bisecting easier
---

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 8c5397c..6ae59dc 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -27,6 +27,9 @@ if vercmp v4.2-rc2-34-g0b05e2d lt $git_desc &&
    vercmp v4.3-rc1-144-gf240bdd gt $git_desc ; then
     # Revert commit that causes unbootable system
     git revert --no-edit 0b05e2d671c40cfb57e66e4e402320d6e056b2f8 # powerpc/32: cacheable_memcpy becomes memcpy
+    git reset HEAD^ # Do not commit revert - this helps with bisecting
 fi
 
+# It the dts file exists, next command fails
+rm -f arch/powerpc/boot/dts/shark-ryu.dts
 git apply --index < ../shark-ryu-board-patch.patch