fix: use item.name instead of escaped_path in merge conflict check#1956
Open
dmbhatti wants to merge 1 commit into
Open
fix: use item.name instead of escaped_path in merge conflict check#1956dmbhatti wants to merge 1 commit into
dmbhatti wants to merge 1 commit into
Conversation
escaped_path is fnamemodify(absolute_path, ":~:."), which is relative to Vim's CWD. Git commands run with worktree_root as CWD. When neogit is opened with cwd=%:p:h pointing to a subdirectory, is_conflicted() receives a path relative to the wrong directory, git diff --check finds nothing, exits 0, and diffview never opens — showing the staging notification instead. Use item.name (from git status output, already relative to git root) consistent with every other is_conflicted call in this function.
dmbhatti
force-pushed
the
fix/merge-conflict-staging-escaped-path
branch
from
7728ee3 to
0d69297
Compare
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
1 participant
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.
escaped_path is fnamemodify(absolute_path, ":~:."), which is relative to Vim's CWD. Git commands run with worktree_root as CWD. When neogit is opened with cwd=%:p:h pointing to a subdirectory, is_conflicted() receives a path relative to the wrong directory, git diff --check finds nothing, exits 0, and diffview never opens — showing the staging notification instead.
Use item.name (from git status output, already relative to git root) consistent with every other is_conflicted call in this function.
Fixes d93d781