Skip to content
Snippets Groups Projects

match file diffs individually

Closed Warren Gifford requested to merge cc/fix-nonindependent-diff-search into main

Created by: camdencheek

This commit fixes an issue where matching diffs as a whole was returning incorrect results. This was because type:diff file:a b would return the intersection of "diffs that modify file a" and "diffs that contain changes matching b" instead of "diffs that contain changes matching b in file a".

This is fixed by executing the full query tree against each file diff, which takes into account the additional file filters while doing diff content search. This also maintains the property that a diff is only generated if we can't short circuit early.

Fixes #25755 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading