From 1e69f085d6b33b059c9286c9309e86dc9addcfc9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 25 Jun 2025 00:41:07 +0800 Subject: [PATCH] Ignore force pushes for changed files in a PR review (#34837) (#34843) Backport #34837 by delvh Fixes #34832 Co-authored-by: delvh Co-authored-by: wxiaoguang --- services/gitdiff/gitdiff.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index a859945378..32f9a82926 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1359,6 +1359,7 @@ func SyncUserSpecificDiff(ctx context.Context, userID int64, pull *issues_model. // But as that does not work for all potential errors, we simply mark all files as unchanged and drop the error which always works, even if not as good as possible if err != nil { log.Error("Could not get changed files between %s and %s for pull request %d in repo with path %s. Assuming no changes. Error: %w", review.CommitSHA, latestCommit, pull.Index, gitRepo.Path, err) + err = nil //nolint } filesChangedSinceLastDiff := make(map[string]pull_model.ViewedState) @@ -1400,7 +1401,7 @@ outer: } } - return review, err + return review, nil } // CommentAsDiff returns c.Patch as *Diff