johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TestTwoCloneCollision: configure git to use merge instead of rebase

Browse Source
This commit is contained in:
Steve Yegge
2025-10-30 20:02:46 -07:00
parent ca81df93f0
commit ea44725679
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beads_twoclone_test.go
View File

@@ -46,6 +46,8 @@ func TestTwoCloneCollision(t *testing.T) {
runCmd(t, cloneA, "./bd", "init", "--quiet", "--prefix", "test") runCmd(t, cloneA, "./bd", "init", "--quiet", "--prefix", "test")
// Enable hash ID mode for collision-free IDs // Enable hash ID mode for collision-free IDs
runCmdWithEnv(t, cloneA, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash") runCmdWithEnv(t, cloneA, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash")
// Configure git to use merge instead of rebase (sorted JSONL merges cleanly)
runCmd(t, cloneA, "git", "config", "pull.rebase", "false")
// Commit the initial .beads directory from clone A // Commit the initial .beads directory from clone A
runCmd(t, cloneA, "git", "add", ".beads") runCmd(t, cloneA, "git", "add", ".beads")
@@ -61,6 +63,8 @@ func TestTwoCloneCollision(t *testing.T) {
runCmd(t, cloneB, "./bd", "init", "--quiet", "--prefix", "test") runCmd(t, cloneB, "./bd", "init", "--quiet", "--prefix", "test")
// Enable hash ID mode (same as clone A) // Enable hash ID mode (same as clone A)
runCmdWithEnv(t, cloneB, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash") runCmdWithEnv(t, cloneB, map[string]string{"BEADS_NO_DAEMON": "1"}, "./bd", "config", "set", "id_mode", "hash")
// Configure git to use merge instead of rebase (sorted JSONL merges cleanly)
runCmd(t, cloneB, "git", "config", "pull.rebase", "false")
// Install git hooks in both clones // Install git hooks in both clones
t.Log("Installing git hooks") t.Log("Installing git hooks")