aboutsummaryrefslogtreecommitdiff
path: root/internal/db/repo_branch.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/db/repo_branch.go')
-rw-r--r--internal/db/repo_branch.go28
1 files changed, 14 insertions, 14 deletions
diff --git a/internal/db/repo_branch.go b/internal/db/repo_branch.go
index 94313101..a4d38ecb 100644
--- a/internal/db/repo_branch.go
+++ b/internal/db/repo_branch.go
@@ -24,33 +24,33 @@ type Branch struct {
}
func GetBranchesByPath(path string) ([]*Branch, error) {
- gitRepo, err := git.OpenRepository(path)
+ gitRepo, err := git.Open(path)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("open repository: %v", err)
}
- brs, err := gitRepo.GetBranches()
+ names, err := gitRepo.Branches()
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("list branches")
}
- branches := make([]*Branch, len(brs))
- for i := range brs {
+ branches := make([]*Branch, len(names))
+ for i := range names {
branches[i] = &Branch{
RepoPath: path,
- Name: brs[i],
+ Name: names[i],
}
}
return branches, nil
}
-func (repo *Repository) GetBranch(br string) (*Branch, error) {
- if !git.IsBranchExist(repo.RepoPath(), br) {
- return nil, errors.ErrBranchNotExist{Name: br}
+func (repo *Repository) GetBranch(name string) (*Branch, error) {
+ if !git.RepoHasBranch(repo.RepoPath(), name) {
+ return nil, errors.ErrBranchNotExist{Name: name}
}
return &Branch{
RepoPath: repo.RepoPath(),
- Name: br,
+ Name: name,
}, nil
}
@@ -59,11 +59,11 @@ func (repo *Repository) GetBranches() ([]*Branch, error) {
}
func (br *Branch) GetCommit() (*git.Commit, error) {
- gitRepo, err := git.OpenRepository(br.RepoPath)
+ gitRepo, err := git.Open(br.RepoPath)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("open repository: %v", err)
}
- return gitRepo.GetBranchCommit(br.Name)
+ return gitRepo.BranchCommit(br.Name)
}
type ProtectBranchWhitelist struct {