From 81b83ea038e39f36f285a0520221d94414382628 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 15 Aug 2016 16:44:03 +0200 Subject: [PATCH] continuous: Apply fixup commit for broken revisions --- continuous/steps/11-patch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch index fa78e34..a4b5e1d 100755 --- a/continuous/steps/11-patch +++ b/continuous/steps/11-patch @@ -56,6 +56,10 @@ if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..2c0f9 EOF fi +if git rev-list --ancestry-path 309b315b6ec686ce050758cc4e29f6ad1125a83f^..97f6e0cc35026a2a09147a6da636d901525e1969^; then + git show 97f6e0cc35026a2a09147a6da636d901525e1969 | git apply --index +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 -- 2.39.2