bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #138046 - onur-ozkan:trim-include-str, r=jieyouxu

Browse source 
trim channel value in `get_closest_merge_commit`

This was a silly bug which caused `git_upstream_merge_base` to never work because it was `nightly\n` not `nightly`.
This commit is contained in:
Michael Goulet 2025-03-06 15:40:01 -05:00 • committed by GitHub
commit 3ce0614950
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/build_helper/src/git.rs
View file

@ -129,7 +129,7 @@ pub fn get_closest_merge_commit(
git.current_dir(git_dir);
}
let channel = include_str!("../../ci/channel");
let channel = include_str!("../../ci/channel").trim();
let merge_base = {
if CiEnv::is_ci() &&