From 6c7179355ef65ef0aa0cc8ea3d57cd5fcee5833b Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Wed, 3 Apr 2024 07:30:42 +0200
Subject: [PATCH] [CI] backport auto-squash detection and -x

* Behaves as it should with merge & squashed pull requests
* Cherry-pick commits with -x for traceability

Refs: https://github.com/kiegroup/git-backporting/issues/113
---
 .forgejo/workflows/backport.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml
index 06e1e208bb..da064feff3 100644
--- a/.forgejo/workflows/backport.yml
+++ b/.forgejo/workflows/backport.yml
@@ -73,11 +73,11 @@ jobs:
           echo "target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}"
           echo "pull-request: ${{ github.event.pull_request.url }}"
 
-      - uses: https://code.forgejo.org/forgejo/git-backporting@9770e517502d6560993bea13bbea316ffcf71f49
+      - uses: https://code.forgejo.org/forgejo/git-backporting@b2554a678d5ea2814f0df3abad2ac4fcdee2d81f
         with:
           target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo
           strategy: ort
           strategy-option: find-renames
-          no-squash: true
+          cherry-pick-options: -x
           auth: ${{ secrets.BACKPORT_TOKEN }}
           pull-request: ${{ github.event.pull_request.url }}