Fix repo override

mislav · mislav · commit 8ff42bf28c2d · 2021-06-17T17:58:46.000+02:00
diff --git a/cmd/gh/main.go b/cmd/gh/main.go
@@ -169,12 +169,6 @@ func mainRun() exitCode {
 			return authError
 		}
 
-		// enable `--repo` override
-		if cmd.Flags().Lookup("repo") != nil {
-			repoOverride, _ := cmd.Flags().GetString("repo")
-			cmdFactory.BaseRepo = cmdutil.OverrideBaseRepoFunc(cmdFactory, repoOverride)
-		}
-
 		return nil
 	}
 
diff --git a/pkg/cmdutil/repo_override.go b/pkg/cmdutil/repo_override.go
@@ -7,8 +7,27 @@ import (
 	"github.com/spf13/cobra"
 )
 
+func executeParentHooks(cmd *cobra.Command, args []string) error {
+	for cmd.HasParent() {
+		cmd = cmd.Parent()
+		if cmd.PersistentPreRunE != nil {
+			return cmd.PersistentPreRunE(cmd, args)
+		}
+	}
+	return nil
+}
+
 func EnableRepoOverride(cmd *cobra.Command, f *Factory) {
 	cmd.PersistentFlags().StringP("repo", "R", "", "Select another repository using the `[HOST/]OWNER/REPO` format")
+
+	cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
+		if err := executeParentHooks(cmd, args); err != nil {
+			return err
+		}
+		repoOverride, _ := cmd.Flags().GetString("repo")
+		f.BaseRepo = OverrideBaseRepoFunc(f, repoOverride)
+		return nil
+	}
 }
 
 func OverrideBaseRepoFunc(f *Factory, override string) func() (ghrepo.Interface, error) {

Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,6 @@ func mainRun() exitCode {`
`169`	`169`	`return authError`
`170`	`170`	`}`
`171`	`171`
`172`		- // enable `--repo` override
`173`		`- if cmd.Flags().Lookup("repo") != nil {`
`174`		`- repoOverride, _ := cmd.Flags().GetString("repo")`
`175`		`- cmdFactory.BaseRepo = cmdutil.OverrideBaseRepoFunc(cmdFactory, repoOverride)`
`176`		`- }`
`177`		`-`
`178`	`172`	`return nil`
`179`	`173`	`}`
`180`	`174`