continuous: Fix determination of where we should revert

[can-benchmark.git] / continuous / steps / 11-patch

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 8c5397c26308d602e6fd41877842120b74c89803..3a478c257c91db6fa589bc7cfb772a2b75a803b3 100755 (executable)
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -21,12 +21,12 @@ function vercmp()
     dpkg --compare-versions $v1 $op $v2
 }
 
-git_desc=$(git describe)
-
-if vercmp v4.2-rc2-34-g0b05e2d lt $git_desc &&
-   vercmp v4.3-rc1-144-gf240bdd gt $git_desc ; then
+if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd03890ea64795e53f17a94928cca22495acb2a^|grep $(git rev-parse HEAD); 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