From bab71fc8d6a10937ba6ee70d3a9b9bb36cc54e53 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 26 Feb 2025 13:35:51 +0100
Subject: [PATCH] revert accidental change in get_closest_merge_commit

---
 src/build_helper/src/git.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs
index 8f0b67ddbd369..3ef9c7ac35e9d 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,
     ]);