From e5c3f8b45ad90f5ae32860bbf1e04940caf17eb4 Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Mon, 1 Dec 2025 22:12:39 -0800 Subject: [PATCH] fix(test): use --local flag in git config check for merge driver test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test was picking up global git config when checking that --skip-merge-driver didn't set the merge.beads.driver config locally. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- cmd/bd/init_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bd/init_test.go b/cmd/bd/init_test.go index 569a479c..79e823e7 100644 --- a/cmd/bd/init_test.go +++ b/cmd/bd/init_test.go @@ -560,8 +560,8 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) { t.Fatalf("Init failed: %v", err) } - // Verify git config was NOT set - _, err = runCommandInDirWithOutput(tmpDir, "git", "config", "merge.beads.driver") + // Verify git config was NOT set locally (use --local to avoid picking up global config) + _, err = runCommandInDirWithOutput(tmpDir, "git", "config", "--local", "merge.beads.driver") if err == nil { t.Error("Expected git config to not be set with --skip-merge-driver") }