Merge pull request cli#27 from github/fix-repo-branch-flags

Nate Smith · web-flow · commit 24ebdc23b5d1 · 2019-10-21T13:38:14.000-05:00
Fix global `--repo`, `--current-branch` functionality
diff --git a/command/root.go b/command/root.go
@@ -17,7 +17,9 @@ var (
 func init() {
 	RootCmd.PersistentFlags().StringVarP(&currentRepo, "repo", "R", "", "current GitHub repository")
 	RootCmd.PersistentFlags().StringVarP(&currentBranch, "current-branch", "B", "", "current git branch")
+}
 
+func initContext() {
 	ctx := context.InitDefaultContext()
 	ctx.SetBranch(currentBranch)
 	repo := currentRepo
@@ -35,6 +37,9 @@ var RootCmd = &cobra.Command{
 	Short: "GitHub CLI",
 	Long:  `Do things with GitHub from your terminal`,
 	Args:  cobra.MinimumNArgs(1),
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		initContext()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("root")
 	},
