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

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`.
rust-lang · Mar 5, 2025 · ce7506e · ce7506e
2 parents d2cdf5e + 056ec72
commit ce7506e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs
@@ -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() &&