Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Mar 23, 2025

Fixes #11391

Proposed changes

GitModule:

  • Do not rely on the (lazy) postUnstageStatus for deleted files, because they may be deleted after its evaluation

RevisionDiffControl:

  • Evaluate DiffFiles.SelectedItems (plural) instead of DiffFiles.SelectedItem (singular) also when checking the validity in DeleteSelectedFiles
  • Use arrays instead of lists in ResetSelectedItemsTo and ResetSelectedItemsWithConfirmation

Before

error popup on reset multiple new files
no reaction on delete multiple files (with #12149)

After

reset & delete multiple new files work silently

Test methodology

  • manual

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

and actually support deleting multiple files
@mstv mstv self-assigned this Mar 23, 2025
@mstv mstv merged commit 62c5b7f into gitextensions:master Mar 25, 2025
4 checks passed
@mstv mstv deleted the fix/delete_files branch March 25, 2025 20:05
@mstv mstv added this to the v5.3 milestone Mar 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resetting new file will spawn an error dialog "The following files are unmerged and will not be reset"
2 participants