From d7c27c1184b4f82dd0fe30346e54dc4cc82d15d5 Mon Sep 17 00:00:00 2001
From: l0ng-ai <24760907+l0ng-ai@users.noreply.github.com>
Date: Mon, 26 Oct 2026 08:30:07 +0800
Subject: [PATCH] fix: configure git identity for merge and rebase test

---
 crates/ide-vcs/tests/log_shape.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/ide-vcs/tests/log_shape.rs b/crates/ide-vcs/tests/log_shape.rs
index a6802f353..2155bc05d 100644
--- a/crates/ide-vcs/tests/log_shape.rs
+++ b/crates/ide-vcs/tests/log_shape.rs
@@ -120,6 +120,11 @@ fn merge_with_options_and_rebase_onto() {
     let tmp = tempfile::tempdir().unwrap();
     let dir = tmp.path();
     git(dir, &["init", "-q"], None);
+    // Repo operations spawn their own Git commands, so command-local `-c`
+    // options in the helper do not supply their committer identity.
+    git(dir, &["config", "user.name", "Test"], None);
+    git(dir, &["config", "user.email", "t@example.com"], None);
+    git(dir, &["config", "commit.gpgsign", "false"], None);
     let base = commit(dir, "a.txt", "base", 1000);
     git(dir, &["checkout", "-q", "-b", "feature"], None);
     let f1 = commit(dir, "f.txt", "f1", 2000);