diff options
| author | Michael Goulet <michael@errs.io> | 2025-03-06 15:40:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-06 15:40:01 -0500 |
| commit | 3ce0614950430fb2cf3a93b101155d0f95fa3343 (patch) | |
| tree | 7b7513e4617daf8ded85e1f38e4c4242aa644e25 | |
| parent | 65b5a2398aed37a6efd4415a52cb4400d3efb412 (diff) | |
| parent | 056ec72efe71f328c40fcce63f070b3b84fbdde1 (diff) | |
| download | rust-3ce0614950430fb2cf3a93b101155d0f95fa3343.tar.gz rust-3ce0614950430fb2cf3a93b101155d0f95fa3343.zip | |
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`.
| -rw-r--r-- | src/build_helper/src/git.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs index 3ef9c7ac35e..9f778a2fd77 100644 --- 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() && |