diff options
author | John Cai <jcai@gitlab.com> | 2023-08-08 20:18:04 +0300 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2023-08-08 20:18:04 +0300 |
commit | 483aeaf99d4d2b2dc1b9ba57fcb1a304d3cf31e3 (patch) | |
tree | 40e9414a356e81346e7b95185154097a76838260 /internal/git2go | |
parent | a0246dcb971ad317978e1925378b9b427dfe21c0 (diff) |
gitaly-git2go: Remove cherry pick
Now that we don't use git2go's cherry pick subcommand anywhere, let's
remove it.
Diffstat (limited to 'internal/git2go')
-rw-r--r-- | internal/git2go/cherry_pick.go | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/internal/git2go/cherry_pick.go b/internal/git2go/cherry_pick.go deleted file mode 100644 index 435d85cbf..000000000 --- a/internal/git2go/cherry_pick.go +++ /dev/null @@ -1,38 +0,0 @@ -package git2go - -import ( - "context" - "time" - - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" -) - -// CherryPickCommand contains parameters to perform a cherry-pick. -type CherryPickCommand struct { - // Repository is the path where to execute the cherry-pick. - Repository string - // CommitterName is the committer name for the resulting commit. - CommitterName string - // CommitterMail is the committer mail for the resulting commit. - CommitterMail string - // CommitterDate is the committer date of revert commit. - CommitterDate time.Time - // Message is the message to be used for the resulting commit. - Message string - // Ours is the commit that the revert is applied to. - Ours string - // Commit is the commit that is to be picked. - Commit string - // Mainline is the parent to be considered the mainline - Mainline uint - // SigningKey is a path to the key to sign commit using OpenPGP - SigningKey string -} - -// CherryPick performs a cherry-pick via gitaly-git2go. -func (b *Executor) CherryPick(ctx context.Context, repo storage.Repository, m CherryPickCommand) (git.ObjectID, error) { - m.SigningKey = b.signingKey - - return b.runWithGob(ctx, repo, "cherry-pick", m) -} |