Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Invalidate comments when file is shortened #11882

Merged
merged 2 commits into from
Jun 14, 2020
Merged

Invalidate comments when file is shortened #11882

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d1b30d
Invalidate comments when file is shortened
zeripath Jun 14, 2020
f847f0a
handle 1 line
zeripath Jun 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion models/issue_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"container/list"
"encoding/json"
"fmt"
"regexp"
"strings"

"code.gitea.io/gitea/modules/git"
Expand Down Expand Up @@ -505,10 +506,12 @@ func (c *Comment) LoadReview() error {
return c.loadReview(x)
}

var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`)

func (c *Comment) checkInvalidation(doer *User, repo *git.Repository, branch string) error {
// FIXME differentiate between previous and proposed line
commit, err := repo.LineBlame(branch, repo.Path, c.TreePath, uint(c.UnsignedLine()))
if err != nil && strings.Contains(err.Error(), "fatal: no such path") {
if err != nil && (strings.Contains(err.Error(), "fatal: no such path") || notEnoughLines.MatchString(err.Error())) {
c.Invalidated = true
return UpdateComment(c, doer)
}
Expand Down