Skip to content

Fix issues with incorrect and empty diffs in Web IDE

Himanshu Kapoor requested to merge 39498-webide-empty-diff into master

What does this MR do?

Fix issues with incorrect diff for added and deleted files, and disallow the ability to stage and commit an empty change.

When staged changes and unstaged changes have exactly the same, but opposite changes, staging or unstaging at that point should cancel each other's change out. This is the default behaviour of git.

This is a fix for #39498 (closed) and #39497 (closed)

This MR is split in 4 parts:

  1. !21673 (merged)
  2. !21675 (closed)
  3. !21676 (merged)
  4. !21680 (merged)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Himanshu Kapoor

Merge request reports