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

Noratrieb · web-flow · commit 221278acbfe9 · 2025-03-06T07:31:24.000+01:00
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`.
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() &&

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ pub fn get_closest_merge_commit(`
`129`	`129`	`git.current_dir(git_dir);`
`130`	`130`	`}`
`131`	`131`
`132`		`- let channel = include_str!("../../ci/channel");`
	`132`	`+ let channel = include_str!("../../ci/channel").trim();`
`133`	`133`
`134`	`134`	`let merge_base = {`
`135`	`135`	`if CiEnv::is_ci() &&`