From: Eugene Syromiatnikov <esyr@openssl.org>
Date: Mon, 15 Jun 2026 08:15:44 +0000 (+0200)
Subject: .github/workflows/backport.yml: show diff on cherry-pick failure
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cdfaabe100fa5fac9574c71ad53ec23dfa5f85a;p=thirdparty%2Fopenssl.git

.github/workflows/backport.yml: show diff on cherry-pick failure

Having the diff available right away in the CI run logs aids evaluation
of severity of the merge conflicts.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Thu Jun 18 12:17:42 2026
(Merged from https://github.com/openssl/openssl/pull/31506)
---

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 658a3ef7cbe..86a53a2abae 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -52,7 +52,7 @@ jobs:
            git config user.name "OpenSSL Machine"
            git config user.email "openssl-machine@openssl.org"
            echo Cherry-picking $REFSTART..$REFEND
-           git cherry-pick $REFSTART..$REFEND
+           git cherry-pick $REFSTART..$REFEND || { git diff | head -n1000; exit 1; }
     - name: config
       if: ${{ contains(join(github.event.pull_request.labels.*.name,','),matrix.release.branch) }}
       run: ${{ matrix.release.cppflags }} ./config --strict-warnings --banner=Configured no-asm enable-fips --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump