Skip to content

[Backport 3.30] Harden the code, see commits#4219

Merged
sbrunner merged 5 commits into
3.30from
ghci/backport/4212-to-3.30
Jun 5, 2026
Merged

[Backport 3.30] Harden the code, see commits#4219
sbrunner merged 5 commits into
3.30from
ghci/backport/4212-to-3.30

Conversation

@geo-ghci-int

@geo-ghci-int geo-ghci-int Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Backport of #4212 to 3.30

Error on cherry-picking: 23a96e7, 18924aa, 4b5f65d, 6f7a92f, 2737527

To continue do:

git fetch && \
  git checkout ghci/backport/4212-to-3.30 && \
  git reset --hard HEAD^ && \
  git cherry-pick 23a96e7baa15077bdb0e5fc5a72b18da23af9121 18924aa1099427bf6547386720f6351f57989b78 4b5f65dcbf2c4aa6fb46cd488218caab748b917a 6f7a92f8cc35f0598f59e1579410bc3d5760051e 2737527a561957f4040da6daa70833eb7c9e5dc4

Resolve the conflict, then:

git add <file> && \
  git cherry-pick --continue

When all the conflicts are resolved, push the branch:

git push origin ghci/backport/4212-to-3.30 --force

@sbrunner sbrunner force-pushed the ghci/backport/4212-to-3.30 branch 6 times, most recently from 1aae837 to ee05c3b Compare June 5, 2026 10:43
@sbrunner sbrunner added the backport 3.28 Backport the pull request to the '3.28' branch label Jun 5, 2026
@sbrunner sbrunner force-pushed the ghci/backport/4212-to-3.30 branch 2 times, most recently from af78dc2 to 8cf34c6 Compare June 5, 2026 13:01
@sbrunner sbrunner force-pushed the ghci/backport/4212-to-3.30 branch from 8cf34c6 to 2eeec93 Compare June 5, 2026 13:15
@sbrunner sbrunner merged commit f199a1d into 3.30 Jun 5, 2026
15 of 16 checks passed
@sbrunner sbrunner deleted the ghci/backport/4212-to-3.30 branch June 5, 2026 13:40
@geo-ghci-int geo-ghci-int Bot mentioned this pull request Jun 5, 2026
Merged
@geo-ghci-int geo-ghci-int Bot removed the backport 3.28 Backport the pull request to the '3.28' branch label Jun 5, 2026
@geo-ghci-int geo-ghci-int Bot added this to the 3.30.32 milestone Jun 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sbrunner sbrunner sbrunner approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.30.32

Development

Successfully merging this pull request may close these issues.

1 participant

@sbrunner