Skip to content

Fix squash with renamed files

Sean McGivern requested to merge fix-squash-with-renamed-files into master

What does this MR do?

Fixes squashing when a renamed file exists in the diff.

Are there points in the code the reviewer needs to double check?

Don't think so!

Why was this MR needed?

This has been broken for the last year, since we added squashing.

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Tests added for this feature/bug
  • Review
    • Has been reviewed by Backend

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4975.

Edited by Grzegorz Bizon

Merge request reports