Skip to content

Commit e7aaa6b

Browse files
committed
Remove hardcoded master reference in end commit bound
1 parent 0e125af commit e7aaa6b

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

src/bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Bounds {
9393
}
9494
(Some(Bound::Commit(start)), None) => Bounds::Commits {
9595
start,
96-
end: args.access.repo().commit("origin/master")?.sha,
96+
end: args.access.repo().commit("HEAD")?.sha,
9797
},
9898
(None, Some(Bound::Commit(end))) => Bounds::Commits {
9999
start: EPOCH_COMMIT.to_string(),

src/github.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,8 @@ impl ToUrl for CommitsUrl<'_> {
224224

225225
impl ToUrl for CommitDetailsUrl<'_> {
226226
fn url(&self) -> String {
227-
// "origin/master" is set as `sha` when there is no `--end=` definition
228-
// specified on the command line. We define the GitHub master branch
229-
// HEAD commit as the end commit in this case
230-
let reference = if self.sha == "origin/master" {
231-
"master"
232-
} else {
233-
self.sha
234-
};
235-
236-
format!("https://api.github.com/repos/{OWNER}/{REPO}/compare/master...{reference}")
227+
let reference = self.sha;
228+
format!("https://api.github.com/repos/{OWNER}/{REPO}/compare/HEAD...{reference}")
237229
}
238230
}
239231

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ impl Config {
10001000
if c.committer.name != BORS_AUTHOR {
10011001
bail!(
10021002
"Expected author {} to be {BORS_AUTHOR} for {}.\n \
1003-
Make sure specified commits are on the master branch \
1003+
Make sure specified commits are on the default branch \
10041004
and refer to a bors merge commit!",
10051005
c.committer.name,
10061006
c.sha

src/repo_access.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub(crate) trait RustRepositoryAccessor {
1212
}
1313

1414
/// Looks up commit associated with `commit_ref`, which can be either a sha
15-
/// or a more general reference like "origin/master".
15+
/// or a more general reference like "origin/HEAD".
1616
/// If `commit_ref` is a commit forked from the "mainline" git history
1717
/// (e.g. a stable tag like `1.88.0`), returns the merge base of the given commit reference.
1818
fn commit(&self, commit_ref: &str) -> anyhow::Result<Commit>;
@@ -33,7 +33,7 @@ impl RustRepositoryAccessor for AccessViaLocalGit {
3333
git::get_commit(commit_ref)
3434
}
3535
fn commits(&self, start_sha: &str, end_sha: &str) -> anyhow::Result<Vec<Commit>> {
36-
let end_sha = if end_sha == "origin/master" {
36+
let end_sha = if end_sha == "HEAD" {
3737
"FETCH_HEAD"
3838
} else {
3939
end_sha

0 commit comments

Comments
 (0)