From 887495f38fb2cb1e0be88dd33f059ad625c8a642 Mon Sep 17 00:00:00 2001 From: Norwin Date: Sat, 26 Sep 2020 18:43:57 +0000 Subject: [PATCH] Fix Pulls Create (#202) small refactor fix TrimLeft bug, improve logging Co-authored-by: Norwin Roosen Reviewed-on: https://gitea.com/gitea/tea/pulls/202 Reviewed-by: 6543 <6543@noreply.gitea.io> Reviewed-by: techknowlogick --- cmd/pulls.go | 8 ++++---- modules/git/branch.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/pulls.go b/cmd/pulls.go index f10954f..33ca227 100644 --- a/cmd/pulls.go +++ b/cmd/pulls.go @@ -339,7 +339,7 @@ func runPullsCreate(ctx *cli.Context) error { login, ownerArg, repoArg := initCommand() client := login.Client() - repo, _, err := login.Client().GetRepo(ownerArg, repoArg) + repo, _, err := client.GetRepo(ownerArg, repoArg) if err != nil { log.Fatal("could not fetch repo meta: ", err) } @@ -374,7 +374,7 @@ func runPullsCreate(ctx *cli.Context) error { remote, err := localRepo.TeaFindBranchRemote("", sha) if err != nil { - return err + log.Fatal("could not determine remote for current branch: ", err) } if remote == nil { @@ -422,7 +422,7 @@ func runPullsCreate(ctx *cli.Context) error { }) 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, @@ -436,7 +436,7 @@ func runPullsCreate(ctx *cli.Context) error { fmt.Print(out) fmt.Println(pr.HTMLURL) - return nil + return err } func argToIndex(arg string) (int64, error) { diff --git a/modules/git/branch.go b/modules/git/branch.go index 042a18b..7773843 100644 --- a/modules/git/branch.go +++ b/modules/git/branch.go @@ -229,5 +229,5 @@ func (r TeaRepo) TeaGetCurrentBranchName() (string, error) { 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 }