diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2025-02-26 19:03:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-26 19:03:58 +0100 |
| commit | 526dd27b4d9ef4d2bcc4b622f3b02ef50b1d714f (patch) | |
| tree | e0f3e86e8d58ed986c0645a39f15f7b84174ed98 | |
| parent | bd9e38df9807ae05b5dc9a45f7ee7cb1ac853f2f (diff) | |
| parent | bab71fc8d6a10937ba6ee70d3a9b9bb36cc54e53 (diff) | |
| download | rust-526dd27b4d9ef4d2bcc4b622f3b02ef50b1d714f.tar.gz rust-526dd27b4d9ef4d2bcc4b622f3b02ef50b1d714f.zip | |
Rollup merge of #137670 - RalfJung:llvm-commit-logic-revert, r=Kobzol
revert accidental change in get_closest_merge_commit This was accidentally merged as part of https://github.com/rust-lang/rust/pull/137594. I need this local diff to be able to debug miri syncs, and then typed `git commit -a` too fast and didn't realize it includes this change... sorry for that. r? ``@Kobzol``
| -rw-r--r-- | src/build_helper/src/git.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs index 8f0b67ddbd3..3ef9c7ac35e 100644 --- a/src/build_helper/src/git.rs +++ b/src/build_helper/src/git.rs @@ -154,6 +154,7 @@ pub fn get_closest_merge_commit( "rev-list", &format!("--author={}", config.git_merge_commit_email), "-n1", + "--first-parent", &merge_base, ]); |