fix: show untracked files when comparing working tree#587
Open
KEY60228 wants to merge 1 commit intosindrets:mainfrom
Open
fix: show untracked files when comparing working tree#587KEY60228 wants to merge 1 commit intosindrets:mainfrom
KEY60228 wants to merge 1 commit intosindrets:mainfrom
Conversation
dlyongemallo
pushed a commit
to dlyongemallo/diffview.nvim
that referenced
this pull request
Feb 4, 2026
) Show untracked files when the right side of the comparison is the working tree (LOCAL), not just when comparing index vs working tree. This allows seeing untracked files in more diff scenarios. Fixes sindrets#584
dlyongemallo
added a commit
to dlyongemallo/diffview.nvim
that referenced
this pull request
Feb 4, 2026
PR sindrets#587 changed the condition to show untracked files whenever the right side is LOCAL (working tree). This caused untracked files to appear when running `DiffviewOpen <commit>`, which compares a commit to the working tree. Restore the original behaviour: only show untracked files when comparing STAGE (index) vs LOCAL (working tree), i.e. standard `DiffviewOpen`.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Note
I apologize for accidentally closing PR #585
Summary
This PR fixes an issue where untracked files are not displayed when comparing the working tree against a specific commit using
DiffviewOpen.Fixes #584
Problem
The current implementation only shows untracked files when comparing the index (stage) against the working tree (
DiffviewOpenwith no arguments). However, the documentation states:When comparing the working tree against a commit, users would expect to see all changes including untracked files, but they are currently hidden.
Solution
Modified the condition in GitAdapter:show_untracked() to check if the right side of the comparison is the working tree (LOCAL), rather than requiring both specific left (STAGE) and right (LOCAL) types.
Before
After
Testing
Notes