From 6edef692a01baf1e4c64d00cd1f15ae6f3167a42 Mon Sep 17 00:00:00 2001 From: Gorbunov Kirill Andreevich Date: Wed, 18 Dec 2024 20:53:05 +0300 Subject: [PATCH] #19 add reset --- internal/source/gitea/gitea.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/internal/source/gitea/gitea.go b/internal/source/gitea/gitea.go index b39b4bb..374dc26 100644 --- a/internal/source/gitea/gitea.go +++ b/internal/source/gitea/gitea.go @@ -467,13 +467,6 @@ func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch, 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() if err != nil { 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()) - 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() if err != nil { 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{ - Commit: *rev, - Mode: git.HardReset, + Mode: git.HardReset, }); err != nil { g.logger.Error(ctx, "reset work_tree error: ", err) return nil, nil, err