Skip to content

Commit c5471db

Browse files
fix: merge and try build url
1 parent a6945c2 commit c5471db

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

src/github/api/operations.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::github::api::base_github_url;
21
use http::StatusCode;
32
use octocrab::params::repos::Reference;
43
use thiserror::Error;
@@ -42,19 +41,7 @@ pub async fn merge_branches(
4241
commit_message: &str,
4342
) -> Result<CommitSha, MergeError> {
4443
let client = repo.client();
45-
let merge_url = repo
46-
.repository
47-
.merges_url
48-
.as_ref()
49-
.map(|url| url.to_string())
50-
.unwrap_or_else(|| {
51-
format!(
52-
"{}/repos/{}/{}/merges",
53-
base_github_url(),
54-
repo.name().owner,
55-
repo.name().name
56-
)
57-
});
44+
let merge_url = format!("/repos/{}/{}/merges", repo.name().owner, repo.name().name);
5845

5946
let request = MergeRequest {
6047
base: base_ref,
@@ -150,8 +137,7 @@ async fn update_branch(
150137
sha: &CommitSha,
151138
) -> Result<(), BranchUpdateError> {
152139
let url = format!(
153-
"{}/repos/{}/{}/git/refs/{}",
154-
base_github_url(),
140+
"/repos/{}/{}/git/refs/{}",
155141
repo.name().owner(),
156142
repo.name().name(),
157143
Reference::Branch(branch_name.clone()).ref_url()

0 commit comments

Comments
 (0)