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

explicitly ignore '.git' folder on Windows #2148

Merged
merged 2 commits into from Feb 9, 2018

Conversation

kevinushey
Copy link
Contributor

@kevinushey kevinushey commented Feb 6, 2018

This PR seeks to resolve an issue where attempts to launch the IDE could fail if the .git folder was not marked as hidden. Effectively, the IDE would get deadlocked between the file monitor scanning for changes to the .git/index.lock file, and attempts to call git status to populate the Git pane.

Resolves #2141.

@jjallaire, let me know if this feels like the right change or if there's a more appropriate place for this fix to live.

Do we want to be resilient against other hidden folders that may become unhidden (e.g. the .Rproj.user folder)?

{
// screen out '.git' folder
if (fileInfo.isDirectory() &&
boost::algorithm::ends_with(fileInfo.absolutePath(), ".git"))
Copy link
Member

Choose a reason for hiding this comment

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

Nit: this will screen out foo.git and bar.git as well.

@jmcphers jmcphers merged commit 38b2d9e into master Feb 9, 2018
@valerie-rstudio valerie-rstudio deleted the bugfix/win32-file-monitor-ignore-git branch January 21, 2022 17:25
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.

IDE hangs when opening certain Git-managed projects on Windows
2 participants