Skip to content

fix(vcs): Make git_repo_base_ref return ref #2898

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.

Sign up for GitHub

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
Nov 4, 2025
Merged

fix(vcs): Make git_repo_base_ref return ref #2898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5c20a
fix(vcs): Make git_repo_base_ref return ref
chromy Oct 30, 2025
dfef54b
Update src/utils/vcs.rs
chromy Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Fixes

- Fix autofilled git base metadata (`--base-ref`, `--base-sha`) when using the `build upload` subcommand in git repos. Previously this worked only in the contexts of GitHub workflows ([#2897](https://github.com/getsentry/sentry-cli/pull/2897)).
- Fix autofilled git base metadata (`--base-ref`, `--base-sha`) when using the `build upload` subcommand in git repos. Previously this worked only in the contexts of GitHub workflows ([#2897](https://github.com/getsentry/sentry-cli/pull/2897), [#2898](https://github.com/getsentry/sentry-cli/pull/2898)).

## 2.57.0

Expand Down
31 changes: 13 additions & 18 deletions src/utils/vcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,30 +272,25 @@ pub fn git_repo_head_ref(repo: &git2::Repository) -> Result<String> {
}

pub fn git_repo_base_ref(repo: &git2::Repository, remote_name: &str) -> Result<String> {
// Get the current HEAD commit
let head_commit = repo.head()?.peel_to_commit()?;

// Try to find the remote tracking branch
let remote_branch_name = format!("refs/remotes/{remote_name}/HEAD");
let remote_ref = repo.find_reference(&remote_branch_name).map_err(|e| {
anyhow::anyhow!("Could not find remote tracking branch for {remote_name}: {e}")
})?;

find_merge_base_ref(repo, &head_commit, &remote_ref)
}
let name = remote_ref
.resolve()?
.shorthand()
.ok_or(anyhow::anyhow!("Remote branch name is not valid UTF-8"))?
.to_owned();

fn find_merge_base_ref(
repo: &git2::Repository,
head_commit: &git2::Commit,
remote_ref: &git2::Reference,
) -> Result<String> {
let remote_commit = remote_ref.peel_to_commit()?;
let merge_base_oid = repo.merge_base(head_commit.id(), remote_commit.id())?;

// Return the merge-base commit SHA as the base reference
let merge_base_sha = merge_base_oid.to_string();
debug!("Found merge-base commit as base reference: {merge_base_sha}");
Ok(merge_base_sha)
let expected_prefix = format!("{remote_name}/");
if let Some(branch_name) = name.strip_prefix(&expected_prefix) {
Ok(branch_name.to_owned())
} else {
Err(anyhow::anyhow!(
"Remote branch name '{name}' does not start with expected prefix '{expected_prefix}'"
))
}
}

/// Like git_repo_base_repo_name but preserves the original case of the repository name.
Expand Down