opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: resolve govet shadow warnings in merge conflict test

Browse source 
Rename err variables to avoid shadowing the outer CreateWorktree error.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
dj-oyu 2026-03-01 06:11:12 +09:00
parent 8c03fa4589
commit fa4ac0f536
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/git/worktree_test.go
View file

@ -243,9 +243,9 @@ func TestMergeWorktreeBranch_Conflict(t *testing.T) {
dir := initTestRepo(t)
wtPath := filepath.Join(dir, ".picoclaw", "worktrees", "merge-conflict")
wt, err := CreateWorktree(dir, wtPath, "plan/merge-conflict")
if err != nil {
t.Fatalf("CreateWorktree: %v", err)
wt, createErr := CreateWorktree(dir, wtPath, "plan/merge-conflict")
if createErr != nil {
t.Fatalf("CreateWorktree: %v", createErr)
}
// Make a change on the base branch
@ -270,9 +270,9 @@ func TestMergeWorktreeBranch_Conflict(t *testing.T) {
}
// Verify base branch file is unchanged (merge was aborted)
content, err := os.ReadFile(filepath.Join(dir, "conflict.txt"))
if err != nil {
t.Fatalf("ReadFile: %v", err)
content, readErr := os.ReadFile(filepath.Join(dir, "conflict.txt"))
if readErr != nil {
t.Fatalf("ReadFile: %v", readErr)
}
if string(content) != "base content" {
t.Errorf("conflict.txt = %q, want %q (merge should have been aborted)", string(content), "base content")