fix(cmd): pre-scan --home after subcommands

steipete · steipete · commit fa25a78977e7 · 2026-05-22T14:36:55.000+01:00
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -297,7 +297,6 @@ func preScanHomeArg(args []string) (string, bool) {
 			}
 			continue
 		}
-		return "", false
 	}
 	return "", false
 }
diff --git a/internal/cmd/root_more_test.go b/internal/cmd/root_more_test.go
@@ -112,6 +112,15 @@ func TestRootHomeFlagOverridesHelpDescription(t *testing.T) {
 	assertPathUnderRoot(t, path, home, "config", "config.json")
 }
 
+func TestRootHomeFlagAppliesBeforeSubcommandHelp(t *testing.T) {
+	setTestConfigHome(t)
+
+	err := Execute([]string{"config", "--home", "relative", "--help"})
+	if err == nil || !strings.Contains(err.Error(), "--home") {
+		t.Fatalf("expected --home error, got %v", err)
+	}
+}
+
 func helpConfigPath(out string) string {
 	for _, line := range strings.Split(out, "\n") {
 		line = strings.TrimSpace(line)
@@ -161,6 +170,11 @@ func TestRootHomePreScanSkipsGlobalFlagValues(t *testing.T) {
 	if !ok || home != "/tmp/gog" {
 		t.Fatalf("home=%q ok=%t, want /tmp/gog true", home, ok)
 	}
+
+	home, ok = preScanHomeArg([]string{"config", "--home", "/tmp/gog", "--help"})
+	if !ok || home != "/tmp/gog" {
+		t.Fatalf("home=%q ok=%t, want /tmp/gog true", home, ok)
+	}
 }
 
 func TestRootHomeFlagRejectsRelativePath(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,6 @@ func preScanHomeArg(args []string) (string, bool) {`
`297`	`297`	`}`
`298`	`298`	`continue`
`299`	`299`	`}`
`300`		`- return "", false`
`301`	`300`	`}`
`302`	`301`	`return "", false`
`303`	`302`	`}`