Fix #1609 (#1617)

tools/goctl/goctl.go

@@ -111,6 +111,10 @@ var commands = []cli.Command{
 					"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 					"https://github.com/zeromicro/go-zero-template directory structure",
 			},
+			cli.StringFlag{
+				Name:  "branch",
+				Usage: "the branch of the remote repo, it does work with --remote",
+			},
 		},
 		Action: apigen.ApiCommand,
 		Subcommands: []cli.Command{
@@ -130,6 +134,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 					cli.StringFlag{
 						Name:  "style",
 						Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/blob/master/tools/goctl/config/readme.md]",
@@ -209,6 +217,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 				Action: gogen.GoCommand,
 			},
@@ -345,6 +357,10 @@ var commands = []cli.Command{
 					"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 					"https://github.com/zeromicro/go-zero-template directory structure",
 			},
+			cli.StringFlag{
+				Name:  "branch",
+				Usage: "the branch of the remote repo, it does work with --remote",
+			},
 			cli.StringFlag{
 				Name:  "version",
 				Usage: "the goctl builder golang image version",
@@ -445,6 +461,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 					cli.StringFlag{
 						Name:  "serviceAccount",
 						Usage: "the ServiceAccount for the deployment",
@@ -482,6 +502,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 				Action: rpc.RPCNew,
 			},
@@ -504,6 +528,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 				Action: rpc.RPCTemplate,
 			},
@@ -548,6 +576,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 			},
 			{
@@ -590,6 +622,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 				Action: rpc.RPC,
 			},
@@ -642,6 +678,10 @@ var commands = []cli.Command{
 									"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 									"https://github.com/zeromicro/go-zero-template directory structure",
 							},
+							cli.StringFlag{
+								Name:  "branch",
+								Usage: "the branch of the remote repo, it does work with --remote",
+							},
 						},
 						Action: model.MysqlDDL,
 					},
@@ -684,6 +724,10 @@ var commands = []cli.Command{
 									"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 									"https://github.com/zeromicro/go-zero-template directory structure",
 							},
+							cli.StringFlag{
+								Name:  "branch",
+								Usage: "the branch of the remote repo, it does work with --remote",
+							},
 						},
 						Action: model.MySqlDataSource,
 					},
@@ -736,6 +780,10 @@ var commands = []cli.Command{
 									"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 									"https://github.com/zeromicro/go-zero-template directory structure",
 							},
+							cli.StringFlag{
+								Name:  "branch",
+								Usage: "the branch of the remote repo, it does work with --remote",
+							},
 						},
 						Action: model.PostgreSqlDataSource,
 					},
@@ -772,6 +820,10 @@ var commands = []cli.Command{
 							"if they are, --remote has higher priority\n\tThe git repo directory must be consistent with the " +
 							"https://github.com/zeromicro/go-zero-template directory structure",
 					},
+					cli.StringFlag{
+						Name:  "branch",
+						Usage: "the branch of the remote repo, it does work with --remote",
+					},
 				},
 				Action: mongo.Action,
 			},