1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
// +build static,system_libgit2
package command
import (
"context"
"errors"
"flag"
"fmt"
"io"
"os"
"time"
git "github.com/libgit2/git2go/v30"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
type mergeSubcommand struct {
request string
}
func (cmd *mergeSubcommand) Flags() *flag.FlagSet {
flags := flag.NewFlagSet("merge", flag.ExitOnError)
flags.StringVar(&cmd.request, "request", "", "git2go.MergeCommand")
return flags
}
func (cmd *mergeSubcommand) Run(context.Context, io.Reader, io.Writer) error {
request, err := git2go.MergeCommandFromSerialized(cmd.request)
if err != nil {
return err
}
if request.AuthorDate.IsZero() {
request.AuthorDate = time.Now()
}
repo, err := git.OpenRepository(request.Repository)
if err != nil {
return fmt.Errorf("could not open repository: %w", err)
}
defer repo.Free()
ours, err := lookupCommit(repo, request.Ours)
if err != nil {
return fmt.Errorf("could not lookup commit %q: %w", request.Ours, err)
}
theirs, err := lookupCommit(repo, request.Theirs)
if err != nil {
return fmt.Errorf("could not lookup commit %q: %w", request.Theirs, err)
}
index, err := repo.MergeCommits(ours, theirs, nil)
if err != nil {
return fmt.Errorf("could not merge commits: %w", err)
}
defer index.Free()
if index.HasConflicts() {
return errors.New("could not auto-merge due to conflicts")
}
tree, err := index.WriteTreeTo(repo)
if err != nil {
return fmt.Errorf("could not write tree: %w", err)
}
committer := git.Signature(git2go.NewSignature(request.AuthorName, request.AuthorMail, request.AuthorDate))
commit, err := repo.CreateCommitFromIds("", &committer, &committer, request.Message, tree, ours.Id(), theirs.Id())
if err != nil {
return fmt.Errorf("could not create merge commit: %w", err)
}
response := git2go.MergeResult{
CommitID: commit.String(),
}
if err := response.SerializeTo(os.Stdout); err != nil {
return err
}
return nil
}
|
