This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Repository navigation
Implement quick fixes for submodules - #838
Merged
Merged
Conversation
This is a quick fix to allow users to stage submodules. `readFile` throws an EISDIR error when it tries to read the contents of the submodules folder. We might run into edge case issues when merging and there are actual conflicts, but for now we have minimal submodule support and we'll defer handling merge conflicts correctly until we implement more comprehensive support.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #828.
Here we implement a couple of quick fixes until we can implement more comprehensive submodule support #309
In the meantime, we now ignore dirty submodules and do not display them in the changed file list. This avoids the uncaught error in #828. We also assume submodules don't have merge markers, which will avoid the ENOENT error when staging a submodule in the Unstaged Changes list.