| @@ -150,11 +150,13 @@ pub fn get_closest_merge_commit( |
|
|
| 150 |
150 |
} |
| 151 |
151 |
}; |
| 152 |
152 |
|
|
153 |
+// Now that rust-lang/rust is the only repo using bors, we can search the entire |
|
154 |
+// history for a bors commit, not just "first parents". This is crucial to make |
|
155 |
+// this logic work when the user has currently checked out a subtree sync branch |
| 153 |
156 |
git.args([ |
| 154 |
157 |
"rev-list", |
| 155 |
158 |
&format!("--author={}", config.git_merge_commit_email), |
| 156 |
159 |
"-n1", |
| 157 |
|
-"--first-parent", |
| 158 |
160 |
&merge_base, |
| 159 |
161 |
]); |
| 160 |
162 |
|