Skip to content

The IDE you know, rebuilt in Rust. IntelliJ IDEA–style keymap, tool windows and search-everywhere in a fast native app: editor, code insight, debugger, Git, terminal, database and HTTP clients for 60+ languages.

fix: configure git identity for merge and rebase test

l0ng-aid7c27c1184b4
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", "[email protected]"], 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);