Git
/
gitea-tea
mirror of https://gitea.com/gitea/tea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Pulls Create (#202) 

small refactor

fix TrimLeft bug, improve logging

Co-authored-by: Norwin Roosen <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/202
Reviewed-by: 6543 <6543@noreply.gitea.io>
Reviewed-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
Norwin 2020-09-26 18:43:57 +00:00 committed by techknowlogick
parent 159bf03d49
commit 887495f38f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/pulls.go
View File

@ -339,7 +339,7 @@ func runPullsCreate(ctx *cli.Context) error {
login, ownerArg, repoArg := initCommand() login, ownerArg, repoArg := initCommand()
client := login.Client() client := login.Client()
repo, _, err := login.Client().GetRepo(ownerArg, repoArg) repo, _, err := client.GetRepo(ownerArg, repoArg)
if err != nil { if err != nil {
log.Fatal("could not fetch repo meta: ", err) log.Fatal("could not fetch repo meta: ", err)
} }
@ -374,7 +374,7 @@ func runPullsCreate(ctx *cli.Context) error {
remote, err := localRepo.TeaFindBranchRemote("", sha) remote, err := localRepo.TeaFindBranchRemote("", sha)
if err != nil { if err != nil {
return err log.Fatal("could not determine remote for current branch: ", err)
} }
if remote == nil { if remote == nil {
@ -422,7 +422,7 @@ func runPullsCreate(ctx *cli.Context) error {
}) })
if err != nil { if err != nil {
log.Fatal("could not create PR: ", err) log.Fatalf("could not create PR from %s to %s:%s: %s", head, ownerArg, base, err)
} }
in := fmt.Sprintf("# #%d %s (%s)\n%s created %s\n\n%s\n", pr.Index, in := fmt.Sprintf("# #%d %s (%s)\n%s created %s\n\n%s\n", pr.Index,
@ -436,7 +436,7 @@ func runPullsCreate(ctx *cli.Context) error {
fmt.Print(out) fmt.Print(out)
fmt.Println(pr.HTMLURL) fmt.Println(pr.HTMLURL)
return nil return err
} }
func argToIndex(arg string) (int64, error) { func argToIndex(arg string) (int64, error) {

2
modules/git/branch.go
View File

@ -229,5 +229,5 @@ func (r TeaRepo) TeaGetCurrentBranchName() (string, error) {
return "", fmt.Errorf("active ref is no branch") return "", fmt.Errorf("active ref is no branch")
} }
return strings.TrimLeft(localHead.Name().String(), "refs/heads/"), nil return strings.TrimPrefix(localHead.Name().String(), "refs/heads/"), nil
} }