unistack-org/pkgdash
4
0
Fork 2
Code Issues 2 Pull Requests 1 Packages Projects Releases Wiki Activity

#19 #20

Closed
kgorbunov wants to merge 112 commits from kgorbunov/pkgdash:#19 into master
pull from: kgorbunov/pkgdash:#19
merge into: unistack-org:master
Conversation 0 Commits 112 Files Changed 7 +1 -15
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6edef692a0 - Show all commits

16
internal/source/gitea/gitea.go
View File

@ -467,13 +467,6 @@ func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch,
var headRef *plumbing.Reference var headRef *plumbing.Reference
targetBranch, err := repo.Branch(plumbing.NewBranchReferenceName(branch).String())
if err != nil {
g.logger.Error(ctx, "cant get repo branch", err)
return nil, nil, err
}
g.logger.Info(ctx, "targetBranch: ", targetBranch)
branches, err := repo.Branches() branches, err := repo.Branches()
if err != nil { if err != nil {
g.logger.Error(ctx, "cant get repo branch", err) g.logger.Error(ctx, "cant get repo branch", err)
@ -500,12 +493,6 @@ func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch,
g.logger.Info(ctx, "repo head "+headRef.String()) g.logger.Info(ctx, "repo head "+headRef.String())
rev, err := repo.ResolveRevision(plumbing.Revision(fmt.Sprintf("remotes/%s/%s", targetBranch.Remote, headRef.Name().Short())))
if err != nil {
g.logger.Error(ctx, "resolve revision error: ", err)
return nil, nil, err
}
wtree, err := repo.Worktree() wtree, err := repo.Worktree()
if err != nil { if err != nil {
g.logger.Error(ctx, "failed to get worktree", err) g.logger.Error(ctx, "failed to get worktree", err)
@ -513,8 +500,7 @@ func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch,
} }
if err = wtree.Reset(&git.ResetOptions{ if err = wtree.Reset(&git.ResetOptions{
Commit: *rev, Mode: git.HardReset,
Mode: git.HardReset,
}); err != nil { }); err != nil {
g.logger.Error(ctx, "reset work_tree error: ", err) g.logger.Error(ctx, "reset work_tree error: ", err)
return nil, nil, err return nil, nil, err