From 88fa9f3fb168bc6c9c2bdc6341b83bc048b38846 Mon Sep 17 00:00:00 2001
From: 99rgosse <61579380+99rgosse@users.noreply.github.com>
Date: Fri, 8 Oct 2021 11:59:35 +0200
Subject: [PATCH] Remove heads pointing to missing old refs (#17076)
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: 6543 <6543@obermui.de>
---
modules/migrations/base/pullrequest.go | 5 +++++
modules/migrations/gitea_uploader.go | 17 +++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/modules/migrations/base/pullrequest.go b/modules/migrations/base/pullrequest.go
index 84b302d18fa..b51a14e47c5 100644
--- a/modules/migrations/base/pullrequest.go
+++ b/modules/migrations/base/pullrequest.go
@@ -41,6 +41,11 @@ func (p *PullRequest) IsForkPullRequest() bool {
return p.Head.RepoPath() != p.Base.RepoPath()
}
+// GetGitRefName returns pull request relative path to head
+func (p PullRequest) GetGitRefName() string {
+ return fmt.Sprintf("refs/pull/%d/head", p.Number)
+}
+
// PullRequestBranch represents a pull request branch
type PullRequestBranch struct {
CloneURL string `yaml:"clone_url"`
diff --git a/modules/migrations/gitea_uploader.go b/modules/migrations/gitea_uploader.go
index 3e8d396ed16..62e8924e544 100644
--- a/modules/migrations/gitea_uploader.go
+++ b/modules/migrations/gitea_uploader.go
@@ -690,6 +690,23 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
}
} else {
head = pr.Head.Ref
+ // Ensure the closed PR SHA still points to an existing ref
+ _, err = git.NewCommand("rev-list", "--quiet", "-1", pr.Head.SHA).RunInDir(g.repo.RepoPath())
+ if err != nil {
+ if pr.Head.SHA != "" {
+ // Git update-ref remove bad references with a relative path
+ log.Warn("Deprecated local head, removing : %v", pr.Head.SHA)
+ relPath := pr.GetGitRefName()
+ _, err = git.NewCommand("update-ref", "--no-deref", "-d", relPath).RunInDir(g.repo.RepoPath())
+ } else {
+ // The SHA is empty, remove the head file
+ log.Warn("Empty reference, removing : %v", pullHead)
+ err = os.Remove(filepath.Join(pullHead, "head"))
+ }
+ if err != nil {
+ log.Error("Cannot remove local head ref, %v", err)
+ }
+ }
}
if pr.Created.IsZero() {