fix(DiffScreen): Reduce git commands by 60% when opening diff view #429
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
MaxFangX
force-pushed
the
2025-12-04-diff-screen-enter-latency
branch
from
e0492a6 to
cc84144
Compare
Cache the result of git rev-parse --show-toplevel per directory. The repo root for a given path never changes during a session, so we can safely cache it after the first lookup. This eliminates a git command on every diff view open and other operations that need to discover the repo.
Skip expensive per-file conflict checks (git ls-files -u and git status) when not in a merge/rebase/cherry-pick state. Use git_conflict.status() which only checks for files like .git/MERGE_HEAD - fast filesystem checks, no git commands. In the common case (no active merge), this eliminates 2 git commands when opening a diff view.
MaxFangX
force-pushed
the
2025-12-04-diff-screen-enter-latency
branch
from
cc84144 to
3d5e4e3
Compare
Contributor
Author
|
Rebased. |
tanvirtin
approved these changes
Dec 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When opening a diff view, vgit runs several git commands to gather file state. Two of these can be optimized:
First,
git rev-parse --show-toplevel(repo discovery) is called frequently but the result never changes for a given directory during a session. This is now cached per-directory. Edge case: if a user runsgit initin a new location during a session, the cache would be stale - rare enough that we accept it rather than add invalidation complexity.Second, the per-file conflict checks (
git ls-files -uandgit status) are only relevant during merge/rebase/cherry-pick operations. We now gate these withgit_conflict.status(), which only checks for files like.git/MERGE_HEAD- fast filesystem checks, no git commands. In the common case (no active merge), this skips 2 git commands.Together these reduce git commands from 5 to 2 when opening a diff view (60% reduction).