From b4efcf84baaa34616bdbd766ab95d9274b8c7789 Mon Sep 17 00:00:00 2001 From: archie Date: Fri, 24 Jul 2026 17:36:29 +0000 Subject: [PATCH] fix: baseline gate repair (go vet ./...) --- internal/worktree/worktree_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/worktree/worktree_test.go b/internal/worktree/worktree_test.go index 2c9168a44..f7b187584 100644 --- a/internal/worktree/worktree_test.go +++ b/internal/worktree/worktree_test.go @@ -201,7 +201,6 @@ func TestPreparePersistentReusesRepoCacheAndCleanupExpiresIt(t *testing.T) { } } -<<<<<<< HEAD func TestAskpassWrittenOnce(t *testing.T) { m := &Manager{WorkDir: t.TempDir()} @@ -242,7 +241,9 @@ func TestAskpassWrittenOnce(t *testing.T) { want := "#!/bin/sh\necho \"$ARCHIE_GIT_TOKEN\"\n" if string(b) != want { t.Fatalf("content = %q, want %q", string(b), want) -======= + } +} + func TestPrepareResumesAfterInterruptedClone(t *testing.T) { if _, err := exec.LookPath("git"); err != nil { t.Skip("git not installed") @@ -331,7 +332,6 @@ func TestPrepareResumesAfterInterruptedClone(t *testing.T) { } if _, err := os.Stat(dir3); !os.IsNotExist(err) { t.Fatal("cleanup left the worktree behind") ->>>>>>> origin/main } }