continuous: Do not revert problematic commit when it is not needed
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 1 Aug 2016 21:57:38 +0000 (23:57 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 1 Aug 2016 21:57:38 +0000 (23:57 +0200)
continuous/steps/11-patch

index a64eaaf..1a8ef76 100755 (executable)
@@ -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