Auto merge of #138878 - jieyouxu:revert-ci-llvm, r=dianqk · rust-lang/rust@b95aac6 (original) (raw)

`@@ -140,7 +140,6 @@ pub fn get_closest_merge_commit(

`

140

140

`// cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"\nexpected success, got: exit status: 1\n"

`

141

141

```` // ```

````

142

142

`// Investigate and resolve this issue instead of skipping it like this.

`

143

``

`-

// NOTE (2025-03): this is probably caused by CI using a sparse checkout.

`

144

143

`(channel == "nightly" || !CiEnv::is_rust_lang_managed_ci_job())

`

145

144

`{

`

146

145

`git_upstream_merge_base(config, git_dir).unwrap()

`

`@@ -151,18 +150,11 @@ pub fn get_closest_merge_commit(

`

151

150

`}

`

152

151

`};

`

153

152

``

154

``

`-

// Now that rust-lang/rust is the only repo using bors, we can search the entire

`

155

``

`-

// history for a bors commit, not just "first parents". This is crucial to make

`

156

``

`-

// this logic work when the user has currently checked out a subtree sync branch.

`

157

``

`-

// At the same time, we use this logic in CI where only a tiny part of the history

`

158

``

`-

// is even checked out, making this kind of history search very fragile. It turns

`

159

``

`` -

// out that by adding --diff-merges=first-parent, we get a usable reply

``

160

``

`-

// even for sparse checkouts: it will just return the most recent bors commit.

`

161

153

` git.args([

`

162

154

`"rev-list",

`

163

155

`&format!("--author={}", config.git_merge_commit_email),

`

164

156

`"-n1",

`

165

``

`-

"--diff-merges=first-parent",

`

``

157

`+

"--first-parent",

`

166

158

`&merge_base,

`

167

159

`]);

`

168

160

``