Skip to content

tagpr: introduce NewGithubCommit func for consistent github.Commit cr… #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
12ya wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −20
Open

tagpr: introduce NewGithubCommit func for consistent github.Commit cr… #278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions tagpr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,8 @@ func (tp *tagpr) Run(ctx context.Context) error {
parent.Commit.SHA = parent.SHA

// Create a new commit
commit := &github.Commit{
Message: github.Ptr(commitMessage),
Tree: parent.Commit.Tree,
Parents: []*github.Commit{parent.Commit},
}
commit := NewGithubCommit(github.Ptr(commitMessage), parent.Commit.Tree, []*github.Commit{parent.Commit})

if tree != nil {
commit.Tree = tree
}
Expand Down Expand Up @@ -506,11 +503,8 @@ func (tp *tagpr) Run(ctx context.Context) error {
}

// Create a new commit
commit := &github.Commit{
Message: github.Ptr("cherry-pick: " + commitish),
Tree: newCommit.Tree,
Parents: cherryPickCommit.Parents,
}
commit := NewGithubCommit(github.Ptr("cherry-pick: "+commitish), newCommit.Tree, cherryPickCommit.Parents)

tempCommit, resp, err := tp.gh.Git.CreateCommit(ctx, tp.owner, tp.repo, commit, nil)
if err != nil {
showGHError(err, resp)
Expand Down Expand Up @@ -544,11 +538,8 @@ func (tp *tagpr) Run(ctx context.Context) error {
// Create a new commit
// The Author is not set because setting the same Author as the original commit makes it
// difficult to create a Verified Commit.
commit = &github.Commit{
Message: cherryPickCommit.Commit.Message,
Tree: mergeCommit.Commit.Tree,
Parents: []*github.Commit{newCommit},
}
commit = NewGithubCommit(cherryPickCommit.Commit.Message, mergeCommit.Commit.Tree, []*github.Commit{newCommit})

newCommit, resp, err = tp.gh.Git.CreateCommit(ctx, tp.owner, tp.repo, commit, nil)
if err != nil {
showGHError(err, resp)
Expand Down Expand Up @@ -649,11 +640,8 @@ func (tp *tagpr) Run(ctx context.Context) error {
return err
}
// Create a new commit
commit = &github.Commit{
Message: github.Ptr(changelogMessage),
Tree: tree,
Parents: []*github.Commit{newCommit},
}
commit = NewGithubCommit(github.Ptr(changelogMessage), tree, []*github.Commit{newCommit})

newCommit, resp, err = tp.gh.Git.CreateCommit(ctx, tp.owner, tp.repo, commit, nil)
if err != nil {
showGHError(err, resp)
Expand Down Expand Up @@ -926,3 +914,11 @@ func buildChunkSearchIssuesQuery(qualifiers string, shasStr string) (chunkQuerie

return chunkQueries
}

func NewGithubCommit(message *string, tree *github.Tree, parents []*github.Commit) *github.Commit {
return &github.Commit{
Message: message,
Tree: tree,
Parents: parents,
}
}
Loading