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

FileSettingsCache: No exception if Git config is inaccessible #9003

Merged

Conversation

gerhardol
Copy link
Member

Part of #8890

Proposed changes

If the .gitconfig file is not accessible at startup you should get a prompt asking to change.
This was not happening in #8890 though, the GE config had to be edited manually.
This PR eliminates some additional exceptions at many operations due to that the FileSettingsCache cannot enable the FileSystemWatcher.
Most normal operation after this.

Note that it is still not possible to store settings, even if .gitconfig is not changed at all.

Screenshots

Before

image

After

Normal operation - mostly

Test methodology

Manual
Repro (part of the original issue) in the issue


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

@ghost ghost assigned gerhardol Mar 16, 2021
@gerhardol gerhardol added this to the 3.5 milestone Mar 16, 2021
@gerhardol gerhardol merged commit 1d7fb78 into gitextensions:master Mar 17, 2021
@gerhardol gerhardol deleted the feature/gitconfig-permission branch March 17, 2021 19:23
@ghost ghost modified the milestones: 3.5, 3.6 Mar 17, 2021
@gerhardol
Copy link
Member Author

@RussKie will you cherry-pick to 3.5 or should I make a PR?

@RussKie
Copy link
Member

RussKie commented Mar 17, 2021 via email

gerhardol added a commit that referenced this pull request Mar 17, 2021
Co-authored-by: Gerhard Olsson <gerhardol@users.noreply.github.com>
(cherry picked from commit 1d7fb78)
@gerhardol
Copy link
Member Author

done

@RussKie RussKie modified the milestones: 3.6, 3.5 Mar 18, 2021
@RussKie
Copy link
Member

RussKie commented Mar 18, 2021

Champion!

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

2 participants