pdewey.com
forked from
tangled.org/core
Monorepo for Tangled
knotserver/git: move git.Branch into branch.go
makes more sense imo.
Signed-off-by: oppiliappan <me@oppi.li>
authored by
+13
knotserver/git/branch.go
+13
knotserver/git/branch.go
···
141
141
return branches, nil
142
142
}
143
143
144
+
func (g *GitRepo) Branch(name string) (*plumbing.Reference, error) {
145
+
ref, err := g.r.Reference(plumbing.NewBranchReferenceName(name), false)
146
+
if err != nil {
147
+
return nil, fmt.Errorf("branch: %w", err)
148
+
}
149
+
150
+
if !ref.Name().IsBranch() {
151
+
return nil, fmt.Errorf("branch: %s is not a branch", ref.Name())
152
+
}
153
+
154
+
return ref, nil
155
+
}
156
+
144
157
func (g *GitRepo) DeleteBranch(branch string) error {
145
158
ref := plumbing.NewBranchReferenceName(branch)
146
159
return g.r.Storer.RemoveReference(ref)
+1
-14
knotserver/git/git.go
+1
-14
knotserver/git/git.go
···
122
122
func (g *GitRepo) TotalCommits() (int, error) {
123
123
output, err := g.revList(
124
124
g.h.String(),
125
-
fmt.Sprintf("--count"),
125
+
"--count",
126
126
)
127
127
if err != nil {
128
128
return 0, fmt.Errorf("failed to run rev-list: %w", err)
···
250
250
251
251
// path is not a submodule
252
252
return nil, ErrNotSubmodule
253
-
}
254
-
255
-
func (g *GitRepo) Branch(name string) (*plumbing.Reference, error) {
256
-
ref, err := g.r.Reference(plumbing.NewBranchReferenceName(name), false)
257
-
if err != nil {
258
-
return nil, fmt.Errorf("branch: %w", err)
259
-
}
260
-
261
-
if !ref.Name().IsBranch() {
262
-
return nil, fmt.Errorf("branch: %s is not a branch", ref.Name())
263
-
}
264
-
265
-
return ref, nil
266
253
}
267
254
268
255
func (g *GitRepo) SetDefaultBranch(branch string) error {