daonanchao/vibe-kanban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strip remote prefix for remote branches (#1373)

Browse Source
This commit is contained in:
Alex Netsch
2025-11-26 09:52:06 +00:00
committed by GitHub
parent e6a55a9b6e
commit d430f37475
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/services/src/services/git.rs
View File

@@ -1418,15 +1418,24 @@ impl GitService {
) -> Result<bool, GitServiceError> { ) -> Result<bool, GitServiceError> {
let repo = self.open_repo(repo_path)?; let repo = self.open_repo(repo_path)?;
let default_remote_name = self.default_remote_name(&repo); let default_remote_name = self.default_remote_name(&repo);
let stripped_branch_name = match self.find_branch_type(repo_path, branch_name) {
Ok(BranchType::Remote) => {
// strip remote prefix if present
Ok(branch_name
.strip_prefix(&format!("{default_remote_name}/"))
.unwrap_or(branch_name))
}
Ok(BranchType::Local) => Ok(branch_name),
Err(e) => Err(e),
}?;
let remote = repo.find_remote(&default_remote_name)?; let remote = repo.find_remote(&default_remote_name)?;
let remote_url = remote let remote_url = remote
.url() .url()
.ok_or_else(|| GitServiceError::InvalidRepository("Remote has no URL".to_string()))?; .ok_or_else(|| GitServiceError::InvalidRepository("Remote has no URL".to_string()))?;
let git_cli = GitCli::new(); let git_cli = GitCli::new();
git_cli git_cli
.check_remote_branch_exists(repo_path, remote_url, branch_name) .check_remote_branch_exists(repo_path, remote_url, stripped_branch_name)
.map_err(|e| e.into()) .map_err(|e| e.into())
} }