Previously merged fix for #37599 seems to have gotten lost

[hnsr]

Summary

I am not 100% sure which guidelines to follow for this problem, but giving this a shot.

I was looking to see if the fix (committed june 22) that was merged on july 16 in PR #37652 (fix for issue #37599) was already released, but strangely I am not able to find this change in the current 2.4-develop branch (which was the branch the PR got merged to). More interestingly, the particular file affected by this change, had its last commit 4 months ago: https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Quote/Model/Quote.php#L1652

I can't quite figure out what caused the disappearance of this fix, and whether other files or PRs are affected. Maybe I'm missing something obvious though.

Examples

See https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Quote/Model/Quote.php#L1652 at which the fix from https://github.com/magento/magento2/pull/37652/files seems to be missing.

Proposed solution

No response

Release note

No response

Triage and priority

• Severity: S0 - Affects critical data or functionality and leaves users without workaround.
• Severity: S1 - Affects critical data or functionality and forces users to employ a workaround.
• Severity: S2 - Affects non-critical data or functionality and forces users to employ a workaround.
• Severity: S3 - Affects non-critical data or functionality and does not force users to employ a workaround.
• Severity: S4 - Affects aesthetics, professional look and feel, “quality” or “usability”.

[m2-assistant]

Hi @hnsr. Thank you for your report.
To speed up processing of this issue, make sure that the issue is reproducible on the vanilla Magento instance following Steps to reproduce. To deploy vanilla Magento instance on our environment, Add a comment to the issue:

• @magento give me 2.4-develop instance - upcoming 2.4.x release
• For more details, review the Magento Contributor Assistant documentation.
• Add a comment to assign the issue: @magento I am working on this
• To learn more about issue processing workflow, refer to the Code Contributions.

---

Join Magento Community Engineering Slack and ask your questions in #github channel.
⚠️ According to the Magento Contribution requirements, all issues must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.
🕙 You can find the schedule on the Magento Community Calendar page.
📞 The triage of issues happens in the queue order. If you want to speed up the delivery of your contribution, join the Community Contributions Triage session to discuss the appropriate ticket.

[DanielRuf]

Looks like someone force-pushed to the branch.

Compare https://github.com/jenyatrishin/magento2/commits/2.4-develop to https://github.com/magento/magento2/commits/2.4-develop?after=21d37c1d6ecebc182711afbd67149f2b9c6c8b5d+489&branch=2.4-develop&qualified_name=refs%2Fheads%2F2.4-develop

[DanielRuf]

A diff of all commit hashes between both branches shows many added commits in the magento/magento2 repo in between old commit hashes. There is definitely something weird going on. the commit hash from the PR in question is definitely missing.

I also see different commits in magento/magento2 that are missing in forks.

For example check the commits by the user alzota here:

[DanielRuf]

Here are the diffs of the rev-list outputs (normal, top, authored, sorted by commit hash):

magento-diffs.zip

To me it definitely looks like it was force-pushed.

[DanielRuf]

The commit which closed the PR was 93d0e1d but it contains no changes for app/code/Magento/Quote/Model/Quote.php.

See also the list of the changed files there:

93d0e1d
https://github.com/magento/magento2/commit/93d0e1d6aaa66c4bd4195a03bf7711498d9d96e8.patch

[DanielRuf]

So it seems it was actually never merged but closed via automation.
The different commit histories are a different topic that needs some further investigation.

If there are more "merged" PRs that were in reality never merged but marked and closed as merged, there may be some issue with the automation or GitHub interface.

[m2-assistant]

Hi @engcom-Hotel. Thank you for working on this issue.
In order to make sure that issue has enough information and ready for development, please read and check the following instruction: 👇

• 1. Verify that issue has all the required information. (Preconditions, Steps to reproduce, Expected result, Actual result).
• 2. Verify that issue has a meaningful description and provides enough information to reproduce the issue.
• 3. Add Area: XXXXX label to the ticket, indicating the functional areas it may be related to.
• 4. Verify that the issue is reproducible on 2.4-develop branch
  Details

  - Add the comment @magento give me 2.4-develop instance to deploy test instance on Magento infrastructure.
  - If the issue is reproducible on 2.4-develop branch, please, add the label Reproduced on 2.4.x.
  - If the issue is not reproducible, add your comment that issue is not reproducible and close the issue and stop verification process here!
• 5. Add label Issue: Confirmed once verification is complete.
• 6. Make sure that automatic system confirms that report has been added to the backlog.

[engcom-Hotel]

Hello @hnsr,

Thanks for the reporting and collaboration!

I agree with your point the PR #37652 shows merged but the changes are not reflected in the 2.4-develop branch.

Hence confirming the issue.

Thanks