Remove short commit variant (#10795)

## Summary

This is never constructed.
This commit is contained in:
Charlie Marsh 2025-01-20 18:35:47 -05:00 committed by GitHub
parent 8e13eb5bb6
commit 45911693c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 20 deletions

View file

@ -49,8 +49,6 @@ pub enum GitReference {
Branch(String),
/// A specific tag.
Tag(String),
/// A specific (short) commit.
ShortCommit(String),
/// From a reference that's ambiguously a branch or tag.
BranchOrTag(String),
/// From a reference that's ambiguously a short commit, a branch, or a tag.
@ -93,7 +91,6 @@ impl GitReference {
match self {
Self::Tag(rev) => Some(rev),
Self::Branch(rev) => Some(rev),
Self::ShortCommit(rev) => Some(rev),
Self::BranchOrTag(rev) => Some(rev),
Self::BranchOrTagOrCommit(rev) => Some(rev),
Self::FullCommit(rev) => Some(rev),
@ -107,7 +104,6 @@ impl GitReference {
match self {
Self::Tag(rev) => rev,
Self::Branch(rev) => rev,
Self::ShortCommit(rev) => rev,
Self::BranchOrTag(rev) => rev,
Self::BranchOrTagOrCommit(rev) => rev,
Self::FullCommit(rev) => rev,
@ -121,7 +117,6 @@ impl GitReference {
match self {
Self::Branch(_) => "branch",
Self::Tag(_) => "tag",
Self::ShortCommit(_) => "short commit",
Self::BranchOrTag(_) => "branch or tag",
Self::FullCommit(_) => "commit",
Self::BranchOrTagOrCommit(_) => "branch, tag, or commit",
@ -374,9 +369,7 @@ impl GitReference {
Self::DefaultBranch => repo.rev_parse("refs/remotes/origin/HEAD"),
// Resolve a direct commit reference.
Self::FullCommit(s) | Self::ShortCommit(s) | Self::NamedRef(s) => {
repo.rev_parse(&format!("{s}^0"))
}
Self::FullCommit(s) | Self::NamedRef(s) => repo.rev_parse(&format!("{s}^0")),
};
result.with_context(|| anyhow::format_err!("failed to find {refkind} `{self}`"))
@ -529,8 +522,7 @@ pub(crate) fn fetch(
// For ambiguous references, we can fetch the exact commit (if known); otherwise,
// we fetch all branches and tags.
GitReference::ShortCommit(branch_or_tag_or_commit)
| GitReference::BranchOrTagOrCommit(branch_or_tag_or_commit) => {
GitReference::BranchOrTagOrCommit(branch_or_tag_or_commit) => {
// The `oid_to_fetch` is the exact commit we want to fetch. But it could be the exact
// commit of a branch or tag. We should only fetch it directly if it's the exact commit
// of a short commit hash.
@ -739,9 +731,7 @@ fn github_fast_path(
GitReference::BranchOrTag(branch_or_tag) => branch_or_tag,
GitReference::DefaultBranch => "HEAD",
GitReference::NamedRef(rev) => rev,
GitReference::FullCommit(rev)
| GitReference::ShortCommit(rev)
| GitReference::BranchOrTagOrCommit(rev) => {
GitReference::FullCommit(rev) | GitReference::BranchOrTagOrCommit(rev) => {
// `revparse_single` (used by `resolve`) is the only way to turn
// short hash -> long hash, but it also parses other things,
// like branch and tag names, which might coincidentally be

View file

@ -115,7 +115,6 @@ impl From<GitUrl> for Url {
match git.reference {
GitReference::Branch(rev)
| GitReference::Tag(rev)
| GitReference::ShortCommit(rev)
| GitReference::BranchOrTag(rev)
| GitReference::NamedRef(rev)
| GitReference::FullCommit(rev)

View file

@ -742,8 +742,7 @@ impl From<RequirementSource> for RequirementSourceWire {
url.query_pairs_mut()
.append_pair("tag", tag.to_string().as_str());
}
GitReference::ShortCommit(rev)
| GitReference::BranchOrTag(rev)
GitReference::BranchOrTag(rev)
| GitReference::BranchOrTagOrCommit(rev)
| GitReference::NamedRef(rev)
| GitReference::FullCommit(rev) => {

View file

@ -3489,7 +3489,6 @@ impl From<GitReference> for GitSourceKind {
match value {
GitReference::Branch(branch) => GitSourceKind::Branch(branch.to_string()),
GitReference::Tag(tag) => GitSourceKind::Tag(tag.to_string()),
GitReference::ShortCommit(rev) => GitSourceKind::Rev(rev.to_string()),
GitReference::BranchOrTag(rev) => GitSourceKind::Rev(rev.to_string()),
GitReference::BranchOrTagOrCommit(rev) => GitSourceKind::Rev(rev.to_string()),
GitReference::NamedRef(rev) => GitSourceKind::Rev(rev.to_string()),
@ -3543,8 +3542,7 @@ fn locked_git_url(git_dist: &GitSourceDist) -> Url {
url.query_pairs_mut()
.append_pair("tag", tag.to_string().as_str());
}
GitReference::ShortCommit(rev)
| GitReference::BranchOrTag(rev)
GitReference::BranchOrTag(rev)
| GitReference::BranchOrTagOrCommit(rev)
| GitReference::NamedRef(rev)
| GitReference::FullCommit(rev) => {

View file

@ -1426,7 +1426,6 @@ impl Source {
GitReference::FullCommit(ref mut rev) => Some(mem::take(rev)),
GitReference::Branch(ref mut rev) => Some(mem::take(rev)),
GitReference::Tag(ref mut rev) => Some(mem::take(rev)),
GitReference::ShortCommit(ref mut rev) => Some(mem::take(rev)),
GitReference::BranchOrTag(ref mut rev) => Some(mem::take(rev)),
GitReference::BranchOrTagOrCommit(ref mut rev) => Some(mem::take(rev)),
GitReference::NamedRef(ref mut rev) => Some(mem::take(rev)),