This repository was archived by the owner on Mar 3, 2023. It is now read-only.
Fix git-diff nested repositories REDUX
#23446
Merged
Conversation
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
Initial fix to `helpers` done by Utkarsh, Spec written by me. Co-authored-by: Utkarsh Gupta <[email protected]>
Contributor
|
same as #21631 ? |
Contributor
Author
|
Yeah, I coudn't figure out what was breaking the build when I tried to help implement these changes in the other PR. Lucky for me completely starting over from scratch fixed everything. I included Utkarsh Gupta as a contributor on the fix commit via co-contributors. This also removes the middleman between me and fixing this problem lol. Utkarsh seems distracted and I'd rather not bother them if I don't have to. I'm gonna go ahead and fix that linter error so we can get this merged finally. |
|
🎉 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Identify the Bug
Fixes #21630
Fixes atom/github#1149
Fixes atom/github#1835
Linked PRs:
tree-view: atom/tree-view#1367
tabs: atom/tabs#560
status-bar: aminya/status-bar#4
atom: #21631
minimap-git-diff: atom-minimap/minimap-git-diff#31
file-icons: file-icons/atom-fs#9
linter: steelbrain/linter#1715
Description of the Change
By using atom.project.repositoryForPath function instead of matching the path with added directories, subfolders will get identified.
Alternate Designs
None.
Possible Drawbacks
Since atom.project.repositoryForPath is an async function, there maybe a little lag when loading file which already has changes.
Verification Process
Create two duplicate repositories, one within the other. If
git-diffshows file changes on any of the nested files, then it cannot be targeting the correct repository and must be targeting an ancestor.Release Notes