From b917002b5957c5cef59f99c1706a85eb13d154c5 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 20 Sep 2015 12:01:46 +0200 Subject: [PATCH] continuous: Fix determination of where we should revert --- continuous/steps/11-patch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch index 6ae59dc..3a478c2 100755 --- a/continuous/steps/11-patch +++ b/continuous/steps/11-patch @@ -21,10 +21,7 @@ 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 -- 2.39.2