Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Upgrade git version to 2.38.1 in Gitserver and Server Docker Images#43615

Merged
varsanojidan merged 5 commits into
mainfrom
iv/upgrade-git-2.38.1
Nov 2, 2022
Merged

Upgrade git version to 2.38.1 in Gitserver and Server Docker Images#43615
varsanojidan merged 5 commits into
mainfrom
iv/upgrade-git-2.38.1

Conversation

@varsanojidan

Copy link
Copy Markdown
Contributor

Upgrade git to version 2.38.1

We previously had it upgraded to min 2.35.2 here, but that had a bug with the git commit-graph command, so we reverted it here

The new version of git resolves the bug above so we can safely upgrade again.

Test plan

Just a version change, built the container locally and verified the version

@varsanojidan varsanojidan requested a review from a team October 28, 2022 17:00
@cla-bot cla-bot Bot added the cla-signed label Oct 28, 2022

@mollylogue mollylogue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯 this is the bug that was causing a lot of repo corruptions, right?

@varsanojidan

Copy link
Copy Markdown
Contributor Author

💯 this is the bug that was causing a lot of repo corruptions, right?

There were actually 2 bugs in play here:

We tried to upgrade to 2.35.2 to get the fix for this bug: https://github.blog/2022-04-12-git-security-vulnerability-announced/

But that version of git had the commit-graph bug that caused the corruptions: https://lore.kernel.org/git/581c7ef2-3de4-eb8a-bfbb-d4bca3522a2d@github.com/T/

So we ended up reverting and going back to the old version, and now this should push us past both bugs, plus give us access to Scalar as an added bonus 😄.

@varsanojidan varsanojidan changed the title Upgrade git version to 2.38.1 Upgrade git version to 2.38.1 in Gitserver and Server Docker Images Oct 28, 2022

@mrnugget mrnugget left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you also update these two places here?

Once that's done and this is merged, can you post in #dev-chat that folks need to upgrade their git versions locally?

Comment thread CHANGELOG.md Outdated
Comment thread cmd/gitserver/Dockerfile Outdated

@sashaostrikov sashaostrikov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Agree with Thorsten's comments, apart from that LGTM brat

@varsanojidan

Copy link
Copy Markdown
Contributor Author

Can you also update these two places here?

Once that's done and this is merged, can you post in #dev-chat that folks need to upgrade their git versions locally?

Sounds good, addressed in most recent commit.

@sourcegraph-bot

sourcegraph-bot commented Oct 31, 2022

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in OWNERS files for diff 5e962fe...0bad536.

Notify File(s)
@mrnugget dev/sg/dependencies/mac.go
dev/sg/dependencies/ubuntu.go
@sourcegraph/dev-experience dev/sg/dependencies/mac.go
dev/sg/dependencies/ubuntu.go

@varsanojidan varsanojidan requested a review from mrnugget October 31, 2022 22:33
@varsanojidan varsanojidan enabled auto-merge (squash) November 2, 2022 14:57
@varsanojidan varsanojidan merged commit c7b81c1 into main Nov 2, 2022
@varsanojidan varsanojidan deleted the iv/upgrade-git-2.38.1 branch November 2, 2022 15:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants