From: Michal Sojka Date: Sat, 31 Oct 2015 15:36:41 +0000 (+0100) Subject: continuous: Update bug patching code X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/ce4da28a74000c4e81d546af1aef61b5d7804d86 continuous: Update bug patching code zero_bytemask() error on PowerPC was fixed upstream. --- diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch index b160f5d..ab0d1ca 100755 --- a/continuous/steps/11-patch +++ b/continuous/steps/11-patch @@ -27,7 +27,7 @@ if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd038 git reset HEAD^ # Do not commit revert - this helps with bisecting fi -if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..HEAD|grep -q $(git rev-parse HEAD); then +if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a5692e6e533fd379081ab06fb58f3f5ee4d80bc^|grep -q $(git rev-parse HEAD); then # Revert commit that causes compile error (v4.3-rc4-3-g990486c) git revert --no-edit 990486c8af044f89bddfbde1d1cf9fde449bedbf # strscpy: zero any trailing garbage bytes in the destination git reset HEAD^ # Do not commit revert - this helps with bisecting