diff options
| author | Ralf Jung <post@ralfj.de> | 2025-02-26 13:35:51 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2025-02-26 13:35:51 +0100 |
| commit | bab71fc8d6a10937ba6ee70d3a9b9bb36cc54e53 (patch) | |
| tree | 7341fa18c2a0adeb2db066da2677169cf9400953 | |
| parent | 2b3cef882aa9085db417837ac6152463060f1f8a (diff) | |
| download | rust-bab71fc8d6a10937ba6ee70d3a9b9bb36cc54e53.tar.gz rust-bab71fc8d6a10937ba6ee70d3a9b9bb36cc54e53.zip | |
revert accidental change in get_closest_merge_commit
| -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, ]); |