gitea/tea
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

Readibility update

Browse Source
This commit is contained in:
harryzcy 2023-05-06 14:03:27 -04:00
parent 96cccedd37
commit 9fdfb1debc
No known key found for this signature in database
GPG Key ID: E3C2287691E40E35
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/pulls/merge.go
View File

@ -44,18 +44,16 @@ var CmdPullsMerge = cli.Command{
ctx := context.InitCommand(cmd) ctx := context.InitCommand(cmd)
ctx.Ensure(context.CtxRequirement{RemoteRepo: true}) ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
var idx int64 if ctx.Args().Len() != 1 {
var err error
if ctx.Args().Len() == 1 {
idx, err = utils.ArgToIndex(ctx.Args().First())
if err != nil {
return err
}
} else {
// If no PR index is provided, try interactive mode // If no PR index is provided, try interactive mode
return interact.MergePull(ctx) return interact.MergePull(ctx)
} }
idx, err := utils.ArgToIndex(ctx.Args().First())
if err != nil {
return err
}
return task.PullMerge(ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{ return task.PullMerge(ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
Style: gitea.MergeStyle(ctx.String("style")), Style: gitea.MergeStyle(ctx.String("style")),
Title: ctx.String("title"), Title: ctx.String("title"),