Mergify backport mangles backports by including unrelated changes

[BlaineEXE]

Expected Behavior

Mergify backport cherry-picks only changes from the specific commit(s) being backported.

Actual Behavior

Mergify backport is adding more changes than just those from the commit being backported.

Please see these 3 backport PRs mergify created that are mangled in Rook's repo:

• Revert "object: create cosi user for each object store" (backport #15035) rook/rook#15122
• Revert "object: create cosi user for each object store" (backport #15035) rook/rook#15121
• docs: update guides and examples for v1.16 release (backport #15105) rook/rook#15120

The first 2 are backports to different branches, from the same source PR which should update 8 files. The third is a different source PR, also updating 8 files.

The 3rd seems to be most interesting to me. It backports 2 commits. The last commit is the one that mergify is adding unexpected changes to. The first commit looks to be backported as intended.

Steps to Reproduce the Problem

1. Mergify backport using GH action (config link below)
2. Observe mangled backport (links above and below)

Specifications

• Pull Request URL: (see below)

• Mergify Config URL: https://github.com/rook/rook/blob/4e727f302cadde7c8503ecc067899ee51e92413e/.mergify.yml

• Revert "object: create cosi user for each object store" (backport #15035) rook/rook#15122

• Revert "object: create cosi user for each object store" (backport #15035) rook/rook#15121

• docs: update guides and examples for v1.16 release (backport #15105) rook/rook#15120

[BlaineEXE]

Based on the undesired changes that mergify is including, it appears that mergify is including all changes from the master branch in the backport instead of only the content of the commit(s) being backported.

[ankush]

We are facing a similar problem:

Examples:

• fix: clarify error message for child tables (backport #28734) frappe/frappe#28738
• fix: switched asset terminology from cost to value (backport #44647) frappe/erpnext#44648

[BlaineEXE]

Does anyone know if it's possible to force mergify to revert back to an earlier, non-bugged version?

[ankush]

Only Mergify team can do that.

[akhilnarang]

Looks like its resolved now: frappe/frappe#28756

Edit: was just for that PR, broken for others.

[BlaineEXE]

Still seem to be broken in Rook's repo :(

[jd]

👋
Thanks for reporting! We'll look into this ASAP.

[DouglasBlackwood]

Hi! We released a fix for the backport action. You shouldn't reencounter the issue.