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>
This commit is contained in:
parent
b6147152f8
commit
88fa9f3fb1
2 changed files with 22 additions and 0 deletions
|
@ -41,6 +41,11 @@ func (p *PullRequest) IsForkPullRequest() bool {
|
||||||
return p.Head.RepoPath() != p.Base.RepoPath()
|
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
|
// PullRequestBranch represents a pull request branch
|
||||||
type PullRequestBranch struct {
|
type PullRequestBranch struct {
|
||||||
CloneURL string `yaml:"clone_url"`
|
CloneURL string `yaml:"clone_url"`
|
||||||
|
|
|
@ -690,6 +690,23 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
head = pr.Head.Ref
|
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() {
|
if pr.Created.IsZero() {
|
||||||
|
|
Reference in a new issue