Skip to content

Git: fix annotated tags on lsremote #9017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2022
Merged

Conversation

stsewd
Copy link
Member

@stsewd stsewd commented Mar 15, 2022

When a tag is annotated,
the real commit will be on the ref that ends with ^{}.

GitPython handles this correctly,
but lsremote was returning the sha of the tag instead of the commit.

We are using GitPython to get the tags when doing a full build,
and lsremote when doing a sync.

This mismatch is causing problems, as rtd will take it as if the tags
were updated.

Fixes #8992

When a tag is annotated,
the real commit will be on the ref that ends with `^{}`.

GitPython handles this correctly,
but lsremote was returning the sha of the tag instead of the commit.

We are using GitPython to get the tags when doing a full build,
and lsremote when doing a sync.

This mismatch is causing problems, as rtd will take it as if the tags
were updated.
@stsewd stsewd requested a review from a team as a code owner March 15, 2022 17:37
Copy link
Member

@humitos humitos left a comment

Choose a reason for hiding this comment

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

Looks good to me. Shouldn't we have a test case for this so we don't hit it again?

@stsewd
Copy link
Member Author

stsewd commented Mar 16, 2022

Shouldn't we have a test case for this so we don't hit it again?

There is already a test case for that in this PR

Copy link
Member

@ericholscher ericholscher left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@agjohnson agjohnson merged commit 4035881 into main Mar 18, 2022
@agjohnson agjohnson deleted the fix-lsremote-annotated-tags branch March 18, 2022 04:20
@humitos
Copy link
Member

humitos commented Mar 28, 2022

Is this deployed already? It's not added to any GH project.

After we deploy this, we should re-enable lsremote feature flag for all the projects.

@stsewd
Copy link
Member Author

stsewd commented Mar 29, 2022

After we deploy this, we should re-enable lsremote feature flag for all the projects.

We need #9019 as well before that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Merge to the master triggers stable builds (two!)
4 participants