-
Notifications
You must be signed in to change notification settings - Fork 35
/
git.go
157 lines (128 loc) · 4.23 KB
/
git.go
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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package common
import (
"errors"
"fmt"
"log"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
)
// CommitChangesToNewBranch creates a new branch, commits to it, and returns to the original worktree.
func CommitChangesToNewBranch(branchName string, commitMessage string, repo *git.Repository, customAuthor *object.Signature) (plumbing.Hash, error) {
// save reference to current head in storage
origRef, err := repo.Head()
if err != nil {
return plumbing.ZeroHash, fmt.Errorf("could not get repo head: %w", err)
}
if err = repo.Storer.SetReference(origRef); err != nil {
return plumbing.ZeroHash, errors.New("could not store original head ref")
}
if _, err = checkoutNewBranch(branchName, repo); err != nil {
return plumbing.ZeroHash, fmt.Errorf("createPrereleaseBranch failed: %w", err)
}
hash, err := CommitChanges(commitMessage, repo, customAuthor)
if err != nil {
return plumbing.ZeroHash, fmt.Errorf("could not commit changes: %w", err)
}
// return to original branch
err = checkoutExistingBranch(origRef.Name(), repo)
if err != nil {
log.Fatal("unable to checkout original branch")
}
return hash, err
}
func CommitChanges(commitMessage string, repo *git.Repository, customAuthor *object.Signature) (plumbing.Hash, error) {
// commit changes to git
log.Printf("Committing changes to git with message '%v'\n", commitMessage)
worktree, err := GetWorktree(repo)
if err != nil {
return plumbing.ZeroHash, err
}
var commitOptions *git.CommitOptions
if customAuthor == nil {
commitOptions = &git.CommitOptions{
All: true,
AllowEmptyCommits: true,
}
} else {
commitOptions = &git.CommitOptions{
All: true,
Author: customAuthor,
AllowEmptyCommits: true,
}
}
hash, err := worktree.Commit(commitMessage, commitOptions)
if err != nil {
return plumbing.ZeroHash, fmt.Errorf("could not commit changes to git: %w", err)
}
return hash, nil
}
func checkoutExistingBranch(branchRefName plumbing.ReferenceName, repo *git.Repository) error {
worktree, err := repo.Worktree()
if err != nil {
return &errGetWorktreeFailed{reason: err}
}
checkoutOptions := &git.CheckoutOptions{
Branch: branchRefName,
Create: false,
Keep: false,
}
log.Printf("git checkout %v\n", branchRefName)
if err = worktree.Checkout(checkoutOptions); err != nil {
return fmt.Errorf("could not check out new branch: %w", err)
}
return nil
}
func checkoutNewBranch(branchName string, repo *git.Repository) (plumbing.ReferenceName, error) {
worktree, err := repo.Worktree()
if err != nil {
return "", &errGetWorktreeFailed{reason: err}
}
branchRefName := plumbing.NewBranchReferenceName(branchName)
checkoutOptions := &git.CheckoutOptions{
Branch: branchRefName,
Create: true,
Keep: true,
}
log.Printf("git branch %v\n", branchName)
if err = worktree.Checkout(checkoutOptions); err != nil {
return "", fmt.Errorf("could not check out new branch: %w", err)
}
return branchRefName, nil
}
// GetWorktree returns the worktree of a repo.
func GetWorktree(repo *git.Repository) (*git.Worktree, error) {
worktree, err := repo.Worktree()
if err != nil {
return nil, &errGetWorktreeFailed{reason: err}
}
return worktree, nil
}
// VerifyWorkingTreeClean returns nil if the working tree is clean or an error if not.
func VerifyWorkingTreeClean(repo *git.Repository) error {
worktree, err := GetWorktree(repo)
if err != nil {
return err
}
status, err := worktree.Status()
if err != nil {
return fmt.Errorf("could not get worktree status: %w", err)
}
if !status.IsClean() {
return &errWorkingTreeNotClean{}
}
return nil
}