chore: exclude test files from gostyle errorstrings analyzer

k1LoW · k1LoW · commit 56567b0cdf9b · 2026-02-20T08:54:14.000+09:00
Add exclude-test: true for errorstrings in .gostyle.yml and remove
all //nostyle:errorstrings inline comments from test files.
diff --git a/.gostyle.yml b/.gostyle.yml
@@ -2,7 +2,9 @@ analyzers:
   disable:
     - mixedcaps # disable mixedcaps analyzer. because the underscores analyzer is more detailed.
     - funcfmt
-# analyzers-settings:
+analyzers-settings:
+  errorstrings:
+    exclude-test: true
 #  dontpanic:
 #    exclude-test: true         # exclude test files (default: false)
 #  handlerrors:
diff --git a/e2e/bare_test.go b/e2e/bare_test.go
@@ -34,7 +34,7 @@ func TestE2E_BareRepository(t *testing.T) {
 			t.Fatalf("expected success for bare repository list, but got error: %v\noutput: %s", err, out)
 		}
 		if !strings.Contains(out, "(bare)") {
-			t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings
+			t.Errorf("output should contain '(bare)' label, got: %s", out)
 		}
 	})
 
@@ -110,7 +110,7 @@ func TestE2E_BareRepository(t *testing.T) {
 		}
 		// Should show both the bare entry and the worktree entry
 		if !strings.Contains(out, "(bare)") {
-			t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings
+			t.Errorf("output should contain '(bare)' label, got: %s", out)
 		}
 		if !strings.Contains(out, "main") {
 			t.Errorf("output should contain 'main' branch, got: %s", out)
@@ -160,7 +160,7 @@ func TestE2E_BareRepository(t *testing.T) {
 			t.Fatalf("expected success for dotgit bare repository list, but got error: %v\noutput: %s", err, out)
 		}
 		if !strings.Contains(out, "(bare)") {
-			t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings
+			t.Errorf("output should contain '(bare)' label, got: %s", out)
 		}
 	})
 
diff --git a/e2e/config_test.go b/e2e/config_test.go
@@ -576,11 +576,11 @@ echo "EXISTING_PWD=$EXISTING_PWD"
 				}
 
 				if strings.Contains(newPwd, branchName) {
-					t.Errorf("NEW_PWD should NOT contain worktree path when creating new worktree with wt.nocd=create, got: %s", newPwd) //nostyle:errorstrings
+					t.Errorf("NEW_PWD should NOT contain worktree path when creating new worktree with wt.nocd=create, got: %s", newPwd)
 				}
 
 				if !strings.Contains(existingPwd, branchName) {
-					t.Errorf("EXISTING_PWD should contain worktree path when switching to existing worktree with wt.nocd=create, got: %s", existingPwd) //nostyle:errorstrings
+					t.Errorf("EXISTING_PWD should contain worktree path when switching to existing worktree with wt.nocd=create, got: %s", existingPwd)
 				}
 			})
 		}
diff --git a/internal/git/branch_test.go b/internal/git/branch_test.go
@@ -32,7 +32,7 @@ func TestBranchExists(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 			if got != tt.want {
-				t.Errorf("BranchExists(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings
+				t.Errorf("BranchExists(%q) = %v, want %v", tt.branch, got, tt.want)
 			}
 		})
 	}
@@ -64,7 +64,7 @@ func TestLocalBranchExists(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 			if got != tt.want {
-				t.Errorf("LocalBranchExists(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings
+				t.Errorf("LocalBranchExists(%q) = %v, want %v", tt.branch, got, tt.want)
 			}
 		})
 	}
@@ -219,7 +219,7 @@ func TestIsBranchMerged(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 			if got != tt.want {
-				t.Errorf("IsBranchMerged(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings
+				t.Errorf("IsBranchMerged(%q) = %v, want %v", tt.branch, got, tt.want)
 			}
 		})
 	}
@@ -242,6 +242,6 @@ func TestDefaultBranch(t *testing.T) {
 	}
 
 	if branch != "main" {
-		t.Errorf("DefaultBranch() = %q, want %q", branch, "main") //nostyle:errorstrings
+		t.Errorf("DefaultBranch() = %q, want %q", branch, "main")
 	}
 }
diff --git a/internal/git/config_test.go b/internal/git/config_test.go
@@ -45,12 +45,12 @@ func TestGitConfig(t *testing.T) {
 				t.Fatalf("GitConfig(%q) error = %v, wantErr %v", tt.key, err, tt.wantErr)
 			}
 			if len(got) != len(tt.want) {
-				t.Errorf("GitConfig(%q) = %v, want %v", tt.key, got, tt.want) //nostyle:errorstrings
+				t.Errorf("GitConfig(%q) = %v, want %v", tt.key, got, tt.want)
 				return
 			}
 			for i := range got {
 				if got[i] != tt.want[i] {
-					t.Errorf("GitConfig(%q)[%d] = %q, want %q", tt.key, i, got[i], tt.want[i]) //nostyle:errorstrings
+					t.Errorf("GitConfig(%q)[%d] = %q, want %q", tt.key, i, got[i], tt.want[i])
 				}
 			}
 		})
@@ -77,16 +77,16 @@ func TestLoadConfig(t *testing.T) {
 	}
 
 	if cfg.BaseDir != "../custom-worktrees" {
-		t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../custom-worktrees") //nostyle:errorstrings
+		t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../custom-worktrees")
 	}
 	if !cfg.CopyIgnored {
-		t.Errorf("LoadConfig().CopyIgnored = %v, want true", cfg.CopyIgnored) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyIgnored = %v, want true", cfg.CopyIgnored)
 	}
 	if cfg.CopyUntracked {
-		t.Errorf("LoadConfig().CopyUntracked = %v, want false", cfg.CopyUntracked) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyUntracked = %v, want false", cfg.CopyUntracked)
 	}
 	if !cfg.CopyModified {
-		t.Errorf("LoadConfig().CopyModified = %v, want true", cfg.CopyModified) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyModified = %v, want true", cfg.CopyModified)
 	}
 
 	// Test with explicit default pattern
@@ -101,19 +101,19 @@ func TestLoadConfig(t *testing.T) {
 	}
 
 	if cfg.BaseDir != "../{gitroot}-wt" {
-		t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../{gitroot}-wt") //nostyle:errorstrings
+		t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../{gitroot}-wt")
 	}
 	if cfg.CopyIgnored {
-		t.Errorf("LoadConfig().CopyIgnored default = %v, want false", cfg.CopyIgnored) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyIgnored default = %v, want false", cfg.CopyIgnored)
 	}
 	if cfg.CopyUntracked {
-		t.Errorf("LoadConfig().CopyUntracked default = %v, want false", cfg.CopyUntracked) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyUntracked default = %v, want false", cfg.CopyUntracked)
 	}
 	if cfg.CopyModified {
-		t.Errorf("LoadConfig().CopyModified default = %v, want false", cfg.CopyModified) //nostyle:errorstrings
+		t.Errorf("LoadConfig().CopyModified default = %v, want false", cfg.CopyModified)
 	}
 	if cfg.NoCd {
-		t.Errorf("LoadConfig().NoCd default = %v, want false", cfg.NoCd) //nostyle:errorstrings
+		t.Errorf("LoadConfig().NoCd default = %v, want false", cfg.NoCd)
 	}
 
 	// Test NoCd setting
@@ -125,7 +125,7 @@ func TestLoadConfig(t *testing.T) {
 	}
 
 	if !cfg.NoCd {
-		t.Errorf("LoadConfig().NoCd = %v, want true", cfg.NoCd) //nostyle:errorstrings
+		t.Errorf("LoadConfig().NoCd = %v, want true", cfg.NoCd)
 	}
 }
 
@@ -176,7 +176,7 @@ func TestExpandPath(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 			if got != tt.want {
-				t.Errorf("ExpandPath(%q) = %q, want %q", tt.path, got, tt.want) //nostyle:errorstrings
+				t.Errorf("ExpandPath(%q) = %q, want %q", tt.path, got, tt.want)
 			}
 		})
 	}
@@ -199,7 +199,7 @@ func TestWorktreePathFor(t *testing.T) {
 	// Expected: parent_dir/repo-wt/feature-branch
 	expectedDir := filepath.Clean(filepath.Join(repo.Root, "../repo-wt/feature-branch"))
 	if path != expectedDir {
-		t.Errorf("WorktreePathFor(\"feature-branch\") = %q, want %q", path, expectedDir) //nostyle:errorstrings
+		t.Errorf("WorktreePathFor(\"feature-branch\") = %q, want %q", path, expectedDir)
 	}
 
 	// Test with custom basedir
@@ -210,7 +210,7 @@ func TestWorktreePathFor(t *testing.T) {
 
 	expectedDir = filepath.Clean(filepath.Join(repo.Root, "../repo-worktrees/feature-branch"))
 	if path != expectedDir {
-		t.Errorf("WorktreePathFor(\"feature-branch\") with custom basedir = %q, want %q", path, expectedDir) //nostyle:errorstrings
+		t.Errorf("WorktreePathFor(\"feature-branch\") with custom basedir = %q, want %q", path, expectedDir)
 	}
 }
 
@@ -256,7 +256,7 @@ func TestExpandBaseDir(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 			if got != tt.want {
-				t.Errorf("ExpandBaseDir(%q) = %q, want %q", tt.baseDir, got, tt.want) //nostyle:errorstrings
+				t.Errorf("ExpandBaseDir(%q) = %q, want %q", tt.baseDir, got, tt.want)
 			}
 		})
 	}
@@ -316,6 +316,6 @@ func TestSetConfig(t *testing.T) {
 		t.Fatalf("GitConfig() error = %v", err)
 	}
 	if len(values) != 1 || values[0] != "../test-wt" {
-		t.Errorf("GitConfig() = %v, want [../test-wt]", values) //nostyle:errorstrings
+		t.Errorf("GitConfig() = %v, want [../test-wt]", values)
 	}
 }
diff --git a/internal/git/repo_context_test.go b/internal/git/repo_context_test.go
@@ -242,7 +242,6 @@ func TestIsBareRepository_WorktreeFromBare(t *testing.T) {
 	}
 }
 
-
 func TestWithRepoContext_CacheHit(t *testing.T) {
 	repo := testutil.NewTestRepo(t)
 	repo.CreateFile("README.md", "# Test")
@@ -306,7 +305,7 @@ func TestShowPrefix(t *testing.T) {
 			t.Fatalf("unexpected error: %v", err)
 		}
 		if prefix != "" {
-			t.Errorf("ShowPrefix() at root = %q, want empty string", prefix) //nostyle:errorstrings
+			t.Errorf("ShowPrefix() at root = %q, want empty string", prefix)
 		}
 	})
 
@@ -324,7 +323,7 @@ func TestShowPrefix(t *testing.T) {
 			t.Fatalf("unexpected error: %v", err)
 		}
 		if prefix != "some/path" {
-			t.Errorf("ShowPrefix() in subdir = %q, want %q", prefix, "some/path") //nostyle:errorstrings
+			t.Errorf("ShowPrefix() in subdir = %q, want %q", prefix, "some/path")
 		}
 	})
 }
@@ -347,7 +346,7 @@ func TestMainRepoRoot(t *testing.T) {
 	}
 
 	if root != repo.Root {
-		t.Errorf("MainRepoRoot() = %q, want %q", root, repo.Root) //nostyle:errorstrings
+		t.Errorf("MainRepoRoot() = %q, want %q", root, repo.Root)
 	}
 
 	// Test from subdirectory
@@ -362,7 +361,7 @@ func TestMainRepoRoot(t *testing.T) {
 	}
 
 	if root != repo.Root {
-		t.Errorf("MainRepoRoot() from subdir = %q, want %q", root, repo.Root) //nostyle:errorstrings
+		t.Errorf("MainRepoRoot() from subdir = %q, want %q", root, repo.Root)
 	}
 }
 
@@ -381,7 +380,7 @@ func TestRepoName(t *testing.T) {
 
 	// The repo is created in a temp directory named "repo"
 	if name != "repo" {
-		t.Errorf("RepoName() = %q, want %q", name, "repo") //nostyle:errorstrings
+		t.Errorf("RepoName() = %q, want %q", name, "repo")
 	}
 }
 
@@ -539,7 +538,7 @@ func TestMainRepoRoot_BareRepo(t *testing.T) {
 
 	// Bare repo: MainRepoRoot should return the bare repo directory itself
 	if root != bareRepo.Root {
-		t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root) //nostyle:errorstrings
+		t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root)
 	}
 }
 
@@ -573,7 +572,7 @@ func TestMainRepoRoot_WorktreeFromBare(t *testing.T) {
 
 	// From a bare-derived worktree, MainRepoRoot should return the bare repo directory
 	if root != bareRepo.Root {
-		t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root) //nostyle:errorstrings
+		t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root)
 	}
 }
 
@@ -600,7 +599,7 @@ func TestRepoName_BareRepo(t *testing.T) {
 
 	// BareTestRepo creates "repo.git", so RepoName should return "repo.git"
 	if name != "repo.git" {
-		t.Errorf("RepoName() = %q, want %q", name, "repo.git") //nostyle:errorstrings
+		t.Errorf("RepoName() = %q, want %q", name, "repo.git")
 	}
 }
 
diff --git a/internal/git/worktree_test.go b/internal/git/worktree_test.go
@@ -84,7 +84,7 @@ func TestCurrentWorktree(t *testing.T) {
 	}
 
 	if path != repo.Root {
-		t.Errorf("CurrentWorktree() = %q, want %q", path, repo.Root) //nostyle:errorstrings
+		t.Errorf("CurrentWorktree() = %q, want %q", path, repo.Root)
 	}
 }
 
@@ -102,7 +102,7 @@ func TestCurrentLocation_NormalRepo(t *testing.T) {
 	}
 
 	if path != repo.Root {
-		t.Errorf("CurrentLocation() = %q, want %q", path, repo.Root) //nostyle:errorstrings
+		t.Errorf("CurrentLocation() = %q, want %q", path, repo.Root)
 	}
 }
 
@@ -133,7 +133,7 @@ func TestCurrentLocation_NormalWorktree(t *testing.T) {
 	}
 
 	if path != wtPath {
-		t.Errorf("CurrentLocation() = %q, want %q", path, wtPath) //nostyle:errorstrings
+		t.Errorf("CurrentLocation() = %q, want %q", path, wtPath)
 	}
 }
 
@@ -159,7 +159,7 @@ func TestCurrentLocation_BareRoot(t *testing.T) {
 	}
 
 	if path != bareRepo.Root {
-		t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root) //nostyle:errorstrings
+		t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root)
 	}
 }
 
@@ -185,7 +185,7 @@ func TestCurrentLocation_CoreBareTrueRoot(t *testing.T) {
 	}
 
 	if path != bareRepo.Root {
-		t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root) //nostyle:errorstrings
+		t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root)
 	}
 }
 
@@ -215,7 +215,7 @@ func TestCurrentLocation_BareWorktree(t *testing.T) {
 	}
 
 	if path != wtPath {
-		t.Errorf("CurrentLocation() = %q, want %q", path, wtPath) //nostyle:errorstrings
+		t.Errorf("CurrentLocation() = %q, want %q", path, wtPath)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func TestE2E_BareRepository(t *testing.T) {`
`34`	`34`	`t.Fatalf("expected success for bare repository list, but got error: %v\noutput: %s", err, out)`
`35`	`35`	`}`
`36`	`36`	`if !strings.Contains(out, "(bare)") {`
`37`		`- t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings`
	`37`	`+ t.Errorf("output should contain '(bare)' label, got: %s", out)`
`38`	`38`	`}`
`39`	`39`	`})`
`40`	`40`
`@@ -110,7 +110,7 @@ func TestE2E_BareRepository(t *testing.T) {`
`110`	`110`	`}`
`111`	`111`	`// Should show both the bare entry and the worktree entry`
`112`	`112`	`if !strings.Contains(out, "(bare)") {`
`113`		`- t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings`
	`113`	`+ t.Errorf("output should contain '(bare)' label, got: %s", out)`
`114`	`114`	`}`
`115`	`115`	`if !strings.Contains(out, "main") {`
`116`	`116`	`t.Errorf("output should contain 'main' branch, got: %s", out)`
`@@ -160,7 +160,7 @@ func TestE2E_BareRepository(t *testing.T) {`
`160`	`160`	`t.Fatalf("expected success for dotgit bare repository list, but got error: %v\noutput: %s", err, out)`
`161`	`161`	`}`
`162`	`162`	`if !strings.Contains(out, "(bare)") {`
`163`		`- t.Errorf("output should contain '(bare)' label, got: %s", out) //nostyle:errorstrings`
	`163`	`+ t.Errorf("output should contain '(bare)' label, got: %s", out)`
`164`	`164`	`}`
`165`	`165`	`})`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -576,11 +576,11 @@ echo "EXISTING_PWD=$EXISTING_PWD"`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`if strings.Contains(newPwd, branchName) {`
`579`		`- t.Errorf("NEW_PWD should NOT contain worktree path when creating new worktree with wt.nocd=create, got: %s", newPwd) //nostyle:errorstrings`
	`579`	`+ t.Errorf("NEW_PWD should NOT contain worktree path when creating new worktree with wt.nocd=create, got: %s", newPwd)`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`if !strings.Contains(existingPwd, branchName) {`
`583`		`- t.Errorf("EXISTING_PWD should contain worktree path when switching to existing worktree with wt.nocd=create, got: %s", existingPwd) //nostyle:errorstrings`
	`583`	`+ t.Errorf("EXISTING_PWD should contain worktree path when switching to existing worktree with wt.nocd=create, got: %s", existingPwd)`
`584`	`584`	`}`
`585`	`585`	`})`
`586`	`586`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func TestBranchExists(t *testing.T) {`
`32`	`32`	`t.Fatalf("unexpected error: %v", err)`
`33`	`33`	`}`
`34`	`34`	`if got != tt.want {`
`35`		`- t.Errorf("BranchExists(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings`
	`35`	`+ t.Errorf("BranchExists(%q) = %v, want %v", tt.branch, got, tt.want)`
`36`	`36`	`}`
`37`	`37`	`})`
`38`	`38`	`}`
`@@ -64,7 +64,7 @@ func TestLocalBranchExists(t *testing.T) {`
`64`	`64`	`t.Fatalf("unexpected error: %v", err)`
`65`	`65`	`}`
`66`	`66`	`if got != tt.want {`
`67`		`- t.Errorf("LocalBranchExists(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings`
	`67`	`+ t.Errorf("LocalBranchExists(%q) = %v, want %v", tt.branch, got, tt.want)`
`68`	`68`	`}`
`69`	`69`	`})`
`70`	`70`	`}`
`@@ -219,7 +219,7 @@ func TestIsBranchMerged(t *testing.T) {`
`219`	`219`	`t.Fatalf("unexpected error: %v", err)`
`220`	`220`	`}`
`221`	`221`	`if got != tt.want {`
`222`		`- t.Errorf("IsBranchMerged(%q) = %v, want %v", tt.branch, got, tt.want) //nostyle:errorstrings`
	`222`	`+ t.Errorf("IsBranchMerged(%q) = %v, want %v", tt.branch, got, tt.want)`
`223`	`223`	`}`
`224`	`224`	`})`
`225`	`225`	`}`
`@@ -242,6 +242,6 @@ func TestDefaultBranch(t *testing.T) {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`if branch != "main" {`
`245`		`- t.Errorf("DefaultBranch() = %q, want %q", branch, "main") //nostyle:errorstrings`
	`245`	`+ t.Errorf("DefaultBranch() = %q, want %q", branch, "main")`
`246`	`246`	`}`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ func TestGitConfig(t *testing.T) {`
`45`	`45`	`t.Fatalf("GitConfig(%q) error = %v, wantErr %v", tt.key, err, tt.wantErr)`
`46`	`46`	`}`
`47`	`47`	`if len(got) != len(tt.want) {`
`48`		`- t.Errorf("GitConfig(%q) = %v, want %v", tt.key, got, tt.want) //nostyle:errorstrings`
	`48`	`+ t.Errorf("GitConfig(%q) = %v, want %v", tt.key, got, tt.want)`
`49`	`49`	`return`
`50`	`50`	`}`
`51`	`51`	`for i := range got {`
`52`	`52`	`if got[i] != tt.want[i] {`
`53`		`- t.Errorf("GitConfig(%q)[%d] = %q, want %q", tt.key, i, got[i], tt.want[i]) //nostyle:errorstrings`
	`53`	`+ t.Errorf("GitConfig(%q)[%d] = %q, want %q", tt.key, i, got[i], tt.want[i])`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`})`
`@@ -77,16 +77,16 @@ func TestLoadConfig(t *testing.T) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if cfg.BaseDir != "../custom-worktrees" {`
`80`		`- t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../custom-worktrees") //nostyle:errorstrings`
	`80`	`+ t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../custom-worktrees")`
`81`	`81`	`}`
`82`	`82`	`if !cfg.CopyIgnored {`
`83`		`- t.Errorf("LoadConfig().CopyIgnored = %v, want true", cfg.CopyIgnored) //nostyle:errorstrings`
	`83`	`+ t.Errorf("LoadConfig().CopyIgnored = %v, want true", cfg.CopyIgnored)`
`84`	`84`	`}`
`85`	`85`	`if cfg.CopyUntracked {`
`86`		`- t.Errorf("LoadConfig().CopyUntracked = %v, want false", cfg.CopyUntracked) //nostyle:errorstrings`
	`86`	`+ t.Errorf("LoadConfig().CopyUntracked = %v, want false", cfg.CopyUntracked)`
`87`	`87`	`}`
`88`	`88`	`if !cfg.CopyModified {`
`89`		`- t.Errorf("LoadConfig().CopyModified = %v, want true", cfg.CopyModified) //nostyle:errorstrings`
	`89`	`+ t.Errorf("LoadConfig().CopyModified = %v, want true", cfg.CopyModified)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// Test with explicit default pattern`
`@@ -101,19 +101,19 @@ func TestLoadConfig(t *testing.T) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if cfg.BaseDir != "../{gitroot}-wt" {`
`104`		`- t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../{gitroot}-wt") //nostyle:errorstrings`
	`104`	`+ t.Errorf("LoadConfig().BaseDir = %q, want %q", cfg.BaseDir, "../{gitroot}-wt")`
`105`	`105`	`}`
`106`	`106`	`if cfg.CopyIgnored {`
`107`		`- t.Errorf("LoadConfig().CopyIgnored default = %v, want false", cfg.CopyIgnored) //nostyle:errorstrings`
	`107`	`+ t.Errorf("LoadConfig().CopyIgnored default = %v, want false", cfg.CopyIgnored)`
`108`	`108`	`}`
`109`	`109`	`if cfg.CopyUntracked {`
`110`		`- t.Errorf("LoadConfig().CopyUntracked default = %v, want false", cfg.CopyUntracked) //nostyle:errorstrings`
	`110`	`+ t.Errorf("LoadConfig().CopyUntracked default = %v, want false", cfg.CopyUntracked)`
`111`	`111`	`}`
`112`	`112`	`if cfg.CopyModified {`
`113`		`- t.Errorf("LoadConfig().CopyModified default = %v, want false", cfg.CopyModified) //nostyle:errorstrings`
	`113`	`+ t.Errorf("LoadConfig().CopyModified default = %v, want false", cfg.CopyModified)`
`114`	`114`	`}`
`115`	`115`	`if cfg.NoCd {`
`116`		`- t.Errorf("LoadConfig().NoCd default = %v, want false", cfg.NoCd) //nostyle:errorstrings`
	`116`	`+ t.Errorf("LoadConfig().NoCd default = %v, want false", cfg.NoCd)`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// Test NoCd setting`
`@@ -125,7 +125,7 @@ func TestLoadConfig(t *testing.T) {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if !cfg.NoCd {`
`128`		`- t.Errorf("LoadConfig().NoCd = %v, want true", cfg.NoCd) //nostyle:errorstrings`
	`128`	`+ t.Errorf("LoadConfig().NoCd = %v, want true", cfg.NoCd)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`@@ -176,7 +176,7 @@ func TestExpandPath(t *testing.T) {`
`176`	`176`	`t.Fatalf("unexpected error: %v", err)`
`177`	`177`	`}`
`178`	`178`	`if got != tt.want {`
`179`		`- t.Errorf("ExpandPath(%q) = %q, want %q", tt.path, got, tt.want) //nostyle:errorstrings`
	`179`	`+ t.Errorf("ExpandPath(%q) = %q, want %q", tt.path, got, tt.want)`
`180`	`180`	`}`
`181`	`181`	`})`
`182`	`182`	`}`
`@@ -199,7 +199,7 @@ func TestWorktreePathFor(t *testing.T) {`
`199`	`199`	`// Expected: parent_dir/repo-wt/feature-branch`
`200`	`200`	`expectedDir := filepath.Clean(filepath.Join(repo.Root, "../repo-wt/feature-branch"))`
`201`	`201`	`if path != expectedDir {`
`202`		`- t.Errorf("WorktreePathFor(\"feature-branch\") = %q, want %q", path, expectedDir) //nostyle:errorstrings`
	`202`	`+ t.Errorf("WorktreePathFor(\"feature-branch\") = %q, want %q", path, expectedDir)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// Test with custom basedir`
`@@ -210,7 +210,7 @@ func TestWorktreePathFor(t *testing.T) {`
`210`	`210`
`211`	`211`	`expectedDir = filepath.Clean(filepath.Join(repo.Root, "../repo-worktrees/feature-branch"))`
`212`	`212`	`if path != expectedDir {`
`213`		`- t.Errorf("WorktreePathFor(\"feature-branch\") with custom basedir = %q, want %q", path, expectedDir) //nostyle:errorstrings`
	`213`	`+ t.Errorf("WorktreePathFor(\"feature-branch\") with custom basedir = %q, want %q", path, expectedDir)`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`@@ -256,7 +256,7 @@ func TestExpandBaseDir(t *testing.T) {`
`256`	`256`	`t.Fatalf("unexpected error: %v", err)`
`257`	`257`	`}`
`258`	`258`	`if got != tt.want {`
`259`		`- t.Errorf("ExpandBaseDir(%q) = %q, want %q", tt.baseDir, got, tt.want) //nostyle:errorstrings`
	`259`	`+ t.Errorf("ExpandBaseDir(%q) = %q, want %q", tt.baseDir, got, tt.want)`
`260`	`260`	`}`
`261`	`261`	`})`
`262`	`262`	`}`
`@@ -316,6 +316,6 @@ func TestSetConfig(t *testing.T) {`
`316`	`316`	`t.Fatalf("GitConfig() error = %v", err)`
`317`	`317`	`}`
`318`	`318`	`if len(values) != 1 \|\| values[0] != "../test-wt" {`
`319`		`- t.Errorf("GitConfig() = %v, want [../test-wt]", values) //nostyle:errorstrings`
	`319`	`+ t.Errorf("GitConfig() = %v, want [../test-wt]", values)`
`320`	`320`	`}`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,6 @@ func TestIsBareRepository_WorktreeFromBare(t *testing.T) {`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
`245`		`-`
`246`	`245`	`func TestWithRepoContext_CacheHit(t *testing.T) {`
`247`	`246`	`repo := testutil.NewTestRepo(t)`
`248`	`247`	`repo.CreateFile("README.md", "# Test")`
`@@ -306,7 +305,7 @@ func TestShowPrefix(t *testing.T) {`
`306`	`305`	`t.Fatalf("unexpected error: %v", err)`
`307`	`306`	`}`
`308`	`307`	`if prefix != "" {`
`309`		`- t.Errorf("ShowPrefix() at root = %q, want empty string", prefix) //nostyle:errorstrings`
	`308`	`+ t.Errorf("ShowPrefix() at root = %q, want empty string", prefix)`
`310`	`309`	`}`
`311`	`310`	`})`
`312`	`311`
`@@ -324,7 +323,7 @@ func TestShowPrefix(t *testing.T) {`
`324`	`323`	`t.Fatalf("unexpected error: %v", err)`
`325`	`324`	`}`
`326`	`325`	`if prefix != "some/path" {`
`327`		`- t.Errorf("ShowPrefix() in subdir = %q, want %q", prefix, "some/path") //nostyle:errorstrings`
	`326`	`+ t.Errorf("ShowPrefix() in subdir = %q, want %q", prefix, "some/path")`
`328`	`327`	`}`
`329`	`328`	`})`
`330`	`329`	`}`
`@@ -347,7 +346,7 @@ func TestMainRepoRoot(t *testing.T) {`
`347`	`346`	`}`
`348`	`347`
`349`	`348`	`if root != repo.Root {`
`350`		`- t.Errorf("MainRepoRoot() = %q, want %q", root, repo.Root) //nostyle:errorstrings`
	`349`	`+ t.Errorf("MainRepoRoot() = %q, want %q", root, repo.Root)`
`351`	`350`	`}`
`352`	`351`
`353`	`352`	`// Test from subdirectory`
`@@ -362,7 +361,7 @@ func TestMainRepoRoot(t *testing.T) {`
`362`	`361`	`}`
`363`	`362`
`364`	`363`	`if root != repo.Root {`
`365`		`- t.Errorf("MainRepoRoot() from subdir = %q, want %q", root, repo.Root) //nostyle:errorstrings`
	`364`	`+ t.Errorf("MainRepoRoot() from subdir = %q, want %q", root, repo.Root)`
`366`	`365`	`}`
`367`	`366`	`}`
`368`	`367`
`@@ -381,7 +380,7 @@ func TestRepoName(t *testing.T) {`
`381`	`380`
`382`	`381`	`// The repo is created in a temp directory named "repo"`
`383`	`382`	`if name != "repo" {`
`384`		`- t.Errorf("RepoName() = %q, want %q", name, "repo") //nostyle:errorstrings`
	`383`	`+ t.Errorf("RepoName() = %q, want %q", name, "repo")`
`385`	`384`	`}`
`386`	`385`	`}`
`387`	`386`
`@@ -539,7 +538,7 @@ func TestMainRepoRoot_BareRepo(t *testing.T) {`
`539`	`538`
`540`	`539`	`// Bare repo: MainRepoRoot should return the bare repo directory itself`
`541`	`540`	`if root != bareRepo.Root {`
`542`		`- t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root) //nostyle:errorstrings`
	`541`	`+ t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root)`
`543`	`542`	`}`
`544`	`543`	`}`
`545`	`544`
`@@ -573,7 +572,7 @@ func TestMainRepoRoot_WorktreeFromBare(t *testing.T) {`
`573`	`572`
`574`	`573`	`// From a bare-derived worktree, MainRepoRoot should return the bare repo directory`
`575`	`574`	`if root != bareRepo.Root {`
`576`		`- t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root) //nostyle:errorstrings`
	`575`	`+ t.Errorf("MainRepoRoot() = %q, want %q", root, bareRepo.Root)`
`577`	`576`	`}`
`578`	`577`	`}`
`579`	`578`
`@@ -600,7 +599,7 @@ func TestRepoName_BareRepo(t *testing.T) {`
`600`	`599`
`601`	`600`	`// BareTestRepo creates "repo.git", so RepoName should return "repo.git"`
`602`	`601`	`if name != "repo.git" {`
`603`		`- t.Errorf("RepoName() = %q, want %q", name, "repo.git") //nostyle:errorstrings`
	`602`	`+ t.Errorf("RepoName() = %q, want %q", name, "repo.git")`
`604`	`603`	`}`
`605`	`604`	`}`
`606`	`605`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func TestCurrentWorktree(t *testing.T) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if path != repo.Root {`
`87`		`- t.Errorf("CurrentWorktree() = %q, want %q", path, repo.Root) //nostyle:errorstrings`
	`87`	`+ t.Errorf("CurrentWorktree() = %q, want %q", path, repo.Root)`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -102,7 +102,7 @@ func TestCurrentLocation_NormalRepo(t *testing.T) {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`if path != repo.Root {`
`105`		`- t.Errorf("CurrentLocation() = %q, want %q", path, repo.Root) //nostyle:errorstrings`
	`105`	`+ t.Errorf("CurrentLocation() = %q, want %q", path, repo.Root)`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -133,7 +133,7 @@ func TestCurrentLocation_NormalWorktree(t *testing.T) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`if path != wtPath {`
`136`		`- t.Errorf("CurrentLocation() = %q, want %q", path, wtPath) //nostyle:errorstrings`
	`136`	`+ t.Errorf("CurrentLocation() = %q, want %q", path, wtPath)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`@@ -159,7 +159,7 @@ func TestCurrentLocation_BareRoot(t *testing.T) {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`if path != bareRepo.Root {`
`162`		`- t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root) //nostyle:errorstrings`
	`162`	`+ t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root)`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`@@ -185,7 +185,7 @@ func TestCurrentLocation_CoreBareTrueRoot(t *testing.T) {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`if path != bareRepo.Root {`
`188`		`- t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root) //nostyle:errorstrings`
	`188`	`+ t.Errorf("CurrentLocation() = %q, want %q", path, bareRepo.Root)`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`@@ -215,7 +215,7 @@ func TestCurrentLocation_BareWorktree(t *testing.T) {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`if path != wtPath {`
`218`		`- t.Errorf("CurrentLocation() = %q, want %q", path, wtPath) //nostyle:errorstrings`
	`218`	`+ t.Errorf("CurrentLocation() = %q, want %q", path, wtPath)`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`