Skip to content

gh-151365: Revert temporary Git downgrade - #156584

Merged
hugovk merged 1 commit into
python:mainfrom
StanFromIreland:revert-6d2b55
Aug 29, 2026
Merged

gh-151365: Revert temporary Git downgrade#156584
hugovk merged 1 commit into
python:mainfrom
StanFromIreland:revert-6d2b55

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented Aug 29, 2026

Copy link
Copy Markdown
Member

This reverts commit 6d2b551.

The Ubuntu 24.04 and Ubuntu 26.04 runner images now default to Git 2.55.0, so the revert is no longer necessary.

@hugovk hugovk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@hugovk
hugovk enabled auto-merge (squash) August 29, 2026 17:45
@hugovk
hugovk merged commit 3e9efe5 into python:main Aug 29, 2026
69 checks passed
@miss-islington-app

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13, 3.14, 3.15.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington-app

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3e9efe550971a02a1580f2202399c1249d4be548 3.14

@bedevere-app

bedevere-app Bot commented Aug 29, 2026

Copy link
Copy Markdown

GH-156588 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Aug 29, 2026
@miss-islington-app

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3e9efe550971a02a1580f2202399c1249d4be548 3.13

@miss-islington-app

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3e9efe550971a02a1580f2202399c1249d4be548 3.12

@StanFromIreland
StanFromIreland deleted the revert-6d2b55 branch August 29, 2026 18:00
hugovk pushed a commit that referenced this pull request Aug 29, 2026
Co-authored-by: Stan Ulbrych <stan@python.org>
@bedevere-app

bedevere-app Bot commented Aug 29, 2026

Copy link
Copy Markdown

GH-156599 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Aug 29, 2026
@StanFromIreland StanFromIreland removed needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Aug 29, 2026
hugovk pushed a commit that referenced this pull request Aug 29, 2026
Revert "gh-151365: Temporarily downgrade Git to prevent fatal error (GH-155495)"

This reverts commit 6d2b551.
(cherry picked from commit 3e9efe5)
注册 for free to join this conversation on GitHub. Already have an account? 登录 to comment

标签

infra CI, GitHub 操作, buildbots, Dependabot, etc. skip news

项目

None yet

Development

Successfully merging this pull request may close these issues.

2 participants