Skip to content

Conversation

pmiossec
Copy link
Member

@pmiossec pmiossec commented Feb 7, 2025

Fixes #11391

Screenshots

Before

After

Test methodology

  • Manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build 9e9082c (Dirty)
  • Git 2.47.0.windows.1
  • Microsoft Windows NT 10.0.26100.0
  • .NET 8.0.12
  • DPI 96dpi (no scaling)
  • Portable: False
  • Microsoft.WindowsDesktop.App Versions
    Microsoft.WindowsDesktop.App 8.0.12 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 9.0.1 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

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.

@pmiossec
Copy link
Member Author

pmiossec commented Feb 7, 2025

@macchmie3 @dmasells Will require some testing of different cases to see if working well and nothing is broken...
/cc @mstv

@mstv
Copy link
Member

mstv commented Feb 7, 2025

Does almost work. But the line ends are not correctly restored:

image

@pmiossec
Copy link
Member Author

pmiossec commented Feb 7, 2025

But the line ends are not correctly restored:

Not linked to the fix (which is just allowing the command to run). A gît behavior.

Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something we can test.to avoid further regressions?

@gerhardol
Copy link
Member

Is this something we can test.to avoid further regressions?

This is Git behavior, hard to test.
I do not think this is a regression, there used to be many other situations where reset of worktree/index failed.

@pmiossec pmiossec force-pushed the fix_reset_staged_new_file branch from 9e9082c to c16f47d Compare February 12, 2025 23:15
@pmiossec pmiossec force-pushed the fix_reset_staged_new_file branch from c16f47d to 557bf2d Compare February 17, 2025 09:17
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not noticed (other) side-effects.

@mstv mstv merged commit 2160db4 into gitextensions:master Feb 18, 2025
4 checks passed
@mstv mstv added this to the v5.3 milestone Feb 18, 2025
@pmiossec pmiossec deleted the fix_reset_staged_new_file branch February 19, 2025 21:56
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"
4 participants