Skip to content

Commit 88f14a8

Browse files
committed
fix download-llvm logic for subtree sync branches
1 parent f5729cf commit 88f14a8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/build_helper/src/git.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,13 @@ pub fn get_closest_merge_commit(
150150
}
151151
};
152152

153+
// Now that rust-lang/rust is the only repo using bors, we can search the entire
154+
// history for a bors commit, not just "first parents". This is crucial to make
155+
// this logic work when the user has currently checked out a subtree sync branch
153156
git.args([
154157
"rev-list",
155158
&format!("--author={}", config.git_merge_commit_email),
156159
"-n1",
157-
"--first-parent",
158160
&merge_base,
159161
]);
160162

0 commit comments

Comments
 (0)