Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No async when minimized #10880

Merged

Conversation

gerhardol
Copy link
Member

Proposed changes

Do not run git-ls-files by default when in minimized to not interfere with restoring.
The setting was added in
cccfbc9 (#10847)
but required explicit configuration.

--
I have used this on/off for some days and get quite consistent the problem with the default implementation.
The drawback with activating the setting is that "is conflicted" is not always detected.

The drawback of making this hack permanent is that the core problem will not be fixed.

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.

Do not run git-ls-files by default when in minimized
to not interfere with restoring.
The setting was added in
cccfbc9
but required explicit configuration.
@ghost ghost assigned gerhardol Apr 13, 2023
@mstv
Copy link
Member

mstv commented Apr 13, 2023

I guess your branch "feature/i9223-async-conflict" is the reason why this bug does not occur to me.

@gerhardol
Copy link
Member Author

I guess your branch "feature/i9223-async-conflict" is the reason why this bug does not occur to me.

Maybe.

The problem mostly fixed in #10802 was not new, it had supposedly occasionally occurred for many years.
Still it did not occur for everyone. I assume it is the same after the change, but not always visible.
This configuration seem to fix it permanently for me.

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.

+0

@gerhardol gerhardol merged commit fd39751 into gitextensions:release/4.1 Apr 15, 2023
3 checks passed
@gerhardol gerhardol deleted the feature/no-async-when-minimized branch April 15, 2023 10:36
@RussKie RussKie added this to the 4.1 milestone Apr 16, 2023
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.

None yet

3 participants