From 23943811fde7a18edb0fd2b45d41aa62745b8e20 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 1 Aug 2016 23:57:38 +0200 Subject: [PATCH] continuous: Do not revert problematic commit when it is not needed --- continuous/steps/11-patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch index a64eaaf..1a8ef76 100755 --- a/continuous/steps/11-patch +++ b/continuous/steps/11-patch @@ -33,8 +33,12 @@ if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a569 git reset HEAD^ # Do not commit revert - this helps with bisecting fi -if git rev-list v4.6-rc6..HEAD|grep -q 7322dd755e7dd34bc5359aa27abeed1687e0f628; then - # Revert commit that causes compile error +if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^|grep -q $(git rev-parse HEAD); then + # Revert commit that causes compile error. This error seems to be + # caused by a compiler bug (see the message of the reverted + # commit) and is magically fixed by an unrelated commit merged + # before v4.6 (commit 20decb7e486d7eefff3931f58d092d2d7c024a1c + # "drivers: net: xgene: Fix error handling") git revert --no-edit 7322dd755e7dd34bc5359aa27abeed1687e0f628 # byteswap: try to avoid __builtin_constant_p gcc bug git reset HEAD^ # Do not commit revert - this helps with bisecting fi -- 2.39.2