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

#19 add reset

Browse Source
This commit is contained in:
Gorbunov Kirill Andreevich 2024-12-18 20:35:55 +03:00
parent f7d5f1334c
commit 22ee50a20e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,9 +467,16 @@ func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch,
var headRef *plumbing.Reference var headRef *plumbing.Reference
targetBranch, err := repo.Branch(branch)
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 branches", err) g.logger.Error(ctx, "cant get repo branch", err)
return nil, nil, err return nil, nil, err
} }
@ -493,12 +500,26 @@ 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)
return nil, nil, err return nil, nil, err
} }
if err = wtree.Reset(&git.ResetOptions{
Commit: *rev,
Mode: git.HardReset,
}); err != nil {
g.logger.Error(ctx, "reset work_tree error: ", err)
return nil, nil, err
}
g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password) g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
if err != nil && err != ErrPRNotExist { if err != nil && err != ErrPRNotExist {
g.logger.Error(ctx, "GetPulls error", err) g.logger.Error(ctx, "GetPulls error", err)