Respect Git tags and branches that look like short commits #2795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
force-pushed
the
charlie/ambiguous-git
branch
from
e1ab207
to
3c26800
Compare
charliermarsh
force-pushed
the
charlie/ambiguous-git
branch
from
3c26800
to
9c9dc57
Compare
charliermarsh
commented
Apr 3, 2024
| Branch(String), | ||
| /// From a tag. | ||
| #[allow(unused)] | ||
| Tag(String), |
There was a problem hiding this comment.
These were removed. (See individual commits.)
charliermarsh
commented
Apr 3, 2024
| /// From a reference that's ambiguously a short commit, a branch, or a tag. | ||
| BranchOrTagOrCommit(String), | ||
| /// From a named reference, like `refs/pull/493/head`. | ||
| NamedRef(String), |
There was a problem hiding this comment.
This was renamed from Ref.
charliermarsh
commented
Apr 3, 2024
| /// From a specific revision, using a full 40-character commit hash. | ||
| FullCommit(String), | ||
| /// From a truncated revision. | ||
| ShortCommit(String), |
There was a problem hiding this comment.
This is now BranchOrTagOrCommit.
charliermarsh
force-pushed
the
charlie/ambiguous-git
branch
from
9c9dc57
to
3a8bf54
Compare
charliermarsh
force-pushed
the
charlie/ambiguous-git
branch
from
3a8bf54
to
0885ee6
Compare
|
I'll review this tonight. |
BurntSushi
approved these changes
Apr 4, 2024
zanieb
approved these changes
Apr 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
If we're given a Git reference like
20240222, we currently treat it as a short commit hash. However... it could be a branch or a tag. This PR improves the Git reference logic to ensure that ambiguous references like20240222are handled appropriately, by attempting to extract it as a branch, then a tag, then a short commit hash.Closes #2772.