Skip to content

Ignore force pushes for changed files in a PR review #34837

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

Merged
merged 4 commits into from
Jun 24, 2025
Merged

Ignore force pushes for changed files in a PR review #34837

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7a31c1
Ignore force pushes for changed files
delvh Jun 24, 2025
625d48a
Prevent similar problems in the future
delvh Jun 24, 2025
9f2624e
Update services/gitdiff/gitdiff.go
wxiaoguang Jun 24, 2025
54ad393
Merge branch 'main' into 34832-missing-err-reset
wxiaoguang Jun 24, 2025
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
3 changes: 2 additions & 1 deletion services/gitdiff/gitdiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,6 +1356,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)
Expand Down Expand Up @@ -1397,7 +1398,7 @@ outer:
}
}

return review, err
return review, nil
}

// CommentAsDiff returns c.Patch as *Diff
Expand Down