Invalidate comments when file is shortened (#11882) (#11884)

Backport #11882 Fix #10686 Signed-off-by: Andrew Thornton <[email protected]>
go-gitea · Jun 15, 2020 · 6abb8d7 · 6abb8d7
1 parent fdc6287
commit 6abb8d7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/models/issue_comment.go b/models/issue_comment.go
@@ -8,6 +8,7 @@ package models
 
 import (
  "fmt"
+ "regexp"
  "strings"
 
  "code.gitea.io/gitea/modules/git"
@@ -489,10 +490,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)
  }